Move `unset` mixin into partial
Move headings into partial
Tidy up