Improved Buttons and menu