Some fixes in design
Some fixes in design