Options page clean ups