* added to create clean URL's
* merged with latest templata modifications
* merged with latest templata modifications