Use wrapping span instead of div

Created by: MartijnCuppens

A <div> in a <h1> is not valid. This PR changes this to a <span> and includes some minor optimizations.