Do various changes to improve usability of the main window a bit