Tweaks to main window layout, fixes #29