Stuff
Initialization reorder in MainWindowController
merge conflict fixed