Fix student data and add switch view button