Template fixes to remove hard tabs