Some refactor/cleanup; more streamlined admin interface