Updated component Routes and templates