Merge branch 'hotfix/0.0.17a'
Merge branch 'release/0.0.18'
Fix some minor layout issues
Merge branch 'hotfix/0.0.18a' into develop