Adding Headpin charts to the mix.
First attempt at fixing layout.
Bad merge