Add automated swap correction to GUI

Add automated swap correction to GUI - @Fillan