tidy up some references for the Main app
move methods to main app
move empty widgets to top