Fix the design of the entire