Relocate global_type markup to partial

* Remove a couple of unsafe `#html_safe` usages
* Use a partial instead (escaped by default)
* Make a couple of commas full stops