refine ui
Merge branch 'develop' of https://github.com/phungnc/ror-user into develop