Continue with the plumbing refactoring (issue #13), this time improve the admin interface.