Add main window
Merge branch 'userinterface' into dev