fix some design issue