Fixed all the design bugs