More work on administrative panels