fixed some design bugs