admin new feature + bugfix