Some design bugs fixed