[WIP] Css bug fixes

References #4050

A WIP PR of minor CSS fixes.
Will keep updating and rebase when ready.