Fixes to design.