Fixed issue: Minor fixes and cleanup
Improved user roles list
Merge pull request #768 from sergeyklay/master

Fixed issue: Minor fixes and cleanup