Many modifications to admin interface, see comment