Minor refactoring of options page.