Designing Template - 9

Some more changes. More functional that style related.