Designing Template - 4

Some more changes