More work on admin interface.