Improve the progress and classroom view. Calculate all available units one time