Started refactoring OptionsActivity