Fixed 3 places in the application where the third student is not displayed properly.
Note: this MR is based on the changes in !1090 to avoid merge conflicts.
Closes #763