Make small changes and additions to variables

* Rearrange size variables
* Add z-index variables
* Make header-line-height unitless
It's fine if deliberate, but these don't output the same values.