Fixed design bugs