Minor cleanup
Refactor options pages