Fix up user profile screen
Merge branch 'fix-profile' into GUI-2.0

* fix-profile:
  Fix up user profile screen