Improvements on the class overview