Updated some basic template tags