improved admin pages
Merge #6