Updated Templates and Added Routes