slimming down template tags, moved another function from template tags to model method, simplified a few templates