Polished changes to Options page