settings page formatting
Merge remote-tracking branch 'origin-richk/master'