Merge pull request #16 from rocketu/layout

changed user models
Conflict merge update