improve styles and classnames
Merge branch 'hotfix/0.3.1'

* hotfix/0.3.1:
  improve styles and classnames