Added option to MainActivity to switch to/from metric, added to intents