Templates v2

@mohamedahmedawad93 @HebaElSobky @maizaied please review and merge my template files !