Removed buttons and moved functionality to menu