Refactor buttons and add the menu