Fixed Template issue for add tile

Fixed up all the issues and commiting for fresh windows