Reorganized client layout

Reorganized client layout
Removed seeing your own user