Improved admin interface