improve admin form