* Major fixes for admin interface