New admin interface. Code cleanup