Changed menu to show only relevant options