Some fixes in design