improve admin
re-improve admin and model association