Tiny fixes
Merge branch 'newdesign'