Renamed, added categories for each class, relevant icons for each class.