added buttons in menu bar and separated into menu and content