Add a menu action for future use
Tweak onOptionsItemSelected a bit
Reduce code in onCreate