More work on the administration pages