Begin formatting user settings screen, misc tweaks