improved classes view, prepare for filter view