enhance user view
Merge branch 'tutorial'