Fix CSS issues

* switch some of the CSS to use vendor macros
* remove some undue complexity