Final tweaks to layout of settings screen