closed #464
some fix in admin panel