Fixed syntax error
Template fixes
Fixed a bad import