Fix CSS issue
Merge branch 'dev'