Reorganizing EJS templates and adding a couple partials