Fix the design of the variants