Designing Template - 5

Lot of design changes