Template Master Page fixes

Write our the master for when umbraco 'forgets' to