Fixed some design bugs