fix some design bugs