Merge branch 'hotfix/2.0.1'
Corrected css
Merge branch 'hotfix/2.0.2' into develop