improves admin interface
Merge branch 'dev'