Fixed a few bugs.
Work on UX.
Merge branch 'student' of github.com:tsauvine/o4 into student
xMerge branch 'student'