Lots of tweaks to option pages