Improved Class dashboard