Fix broken tests
Extract header and sidebar into partials