Refactored options page