GEM: 82 Moved css around
Merge branch 'master' into web/drptv/53