Improve JS and templates of admin roles