Changed stylesheet to proper version
Fixed some minor styling problems
Merge branch 'hotfix/v1.0.1'