Views rework for class presentation