Added Partials
Better Routing