Fixing issues
Preview now showing all templates correctly