Improve admin panel experience #2