Changed the user view slightly
Merge commit