Updated settings page templates to match main site, which had
drifed for a few months and had a number of implementation bugs.