fix some design