Templates and Footer improvements