Moving title into menubar and other tweaks