general option page cleanups