First Fix of final template

Use this as a role back in case of any other disasters