Edit the design fix some bug