Change class around a bit