Refactoring the student booking screen
Merge remote-tracking branch 'upstream/master'