#900 Settings Page changes - looks big but lots of small stuff…