fixed css bug
Merge branch 'hotfix/css_bugs'