ClassNames changed, Year selection fixed