Fix whitespace errors and missing comma on JSON
Add Roger's change for settings layout