Template creation fix + template collection view for iPhone