Small consistency adjustment for intent declarations and calls in onOptionsItemSelected

Small consistency adjustment.
Set all intent declarations and calls to use the Intent i that is declared at the beginning of the onOptionsItemSelected method.
Previously, only half of the calls were using Intent i. Now all are.