Added Square And Rectangle Templates