Refactored admin models.  Also removed offending template tags.