Add buttons to menu
Fix conflicts