solved the layout issues for users
Merge branch 'master' of github.com:angmeng/icode-erp