design fixes
Merge branch 'release/v1.0.3'