Move buttons on right to toolbar and clean up main window layout