Some fixes to the design