Refactor a bunch into partials
Refactor layouts