view for admin
Merge branch 'history'