Style sheet updates

Various CSS additions.
Merge branch 'master' into assets

Merging work from master branch into assets