General layout and partials
simplify the specs
Finish chapter 5