WIP: fix student view right parts