modify admin views
Merge origin/master