Adds the user settings tab back and disables the link, and position the logout button to the right
Merge branch 'nickUIUXImprovements' into dev