Misc cleanup

Made main window cleaner and not filled with extra stuff.