Better positioning of settings nav buttons

Also corrected padding around the password form