Add include tag instead of the hardcoded template() function. Also fixes, cleapups