Refined the design of the parts in 2D.