Post Sprint

Fixes to bugs found during usability tests