Post Sprint

Update to desktop tests and functionality, as well as mobile
functionality and on screen UI changes.