Added some more UI code, push base, fixed a multi-student bug