Changes for nice behavior of admin panel