Designing Template - 8 Nearing the end.

Some more template changes and some core php changes