fixes and bugfixes, admin menu adjust