fixed bugs
New templates