Some changes
Tweaking styles
Merge branch 'hotfix/1.02.01'