complete rework of classes and css file