Small refactoring of options page