Improvements and bugfixes in admin layout
Improvements in admin