Adjust the classes properly