Enhance admin page with better data structure
Merge pull request #25 from johngian/admin-enhancements

Enhance admin page with better data structure