Cherry Pick of CSS Updates

Merge in the updates to the CSS and things from the Here Be Dragons branch.