Merge branch 'hotfix/0.3.1'

* hotfix/0.3.1:
  improve styles and classnames
fix broken reference to style.css
Merge branch 'hotfix/0.3.2' into develop

* hotfix/0.3.2:
  fix broken reference to style.css