Clean up the options call when moving to the main activity
Merge pull request #73 from NoblesseOblige/master

Clean up the options call when moving to the main activity