Show settings-cog and back button

closes #3925
- Make user-settings-cog reappear
- Show [< Users] back button
Merge pull request #3944 from halfdan/3925-cog-back

Show settings-cog and back button