user view update
Merge branch 'Unho' into dev