Design fixes
Merge branch 'fixes' into some-fixes