Fixed code conventions in user settings, changed top-level page names

Last pull request...