design bugs fixed