Some fixes on admin panel