Moved User related code to its own bundle
Tune layouts
Tune layouts
Layout changes