Changes placement of some h1's
Fixes Merge conflicts