Bugfixes in admin panel