Merge progress on admin pages #81

Closed bmeglathery closed 7 years ago