-option page improvements
-options cleanup