Changed some classes on design.