Added role based permission UI and some UI cleanup
Merge branch 'master' of github.com:gleez/cms