added buttons and menu-stuff