GEM: 82 Moved css around
Merge branch 'web/hotfix/82' into dev