Complete student code and UI changes