Update layout of general settings page
Merge pull request #2964 from JosephMcc/general-settings

Update layout of general settings page