Many styling cahnges
Merge branch 'hotfix/0.0.3.3' into develop