Lots more updates

* Tweaked content conversion
* Fixed header