Enhance admin page with better data structure