Set all activities to correctly use the options menu.
Removed unused menu options