Refactor _includes into partials