improve admin.py again