some bugs fixed in design