Move main menu in proper place.
Fix naming of toolbar.