Finished refactoring OptionsActivity