Added routing and template clean up via partials