Further tweaks to sign up and settings page