Updating class names and removing gutters