Minor change in MainWindowController
UI changes
Merge remote-tracking branch 'origin/develop' into develop
Merge branch 'Jules'' into develop