updated models and base.html