Some admin interface tidy up