Post Sprint

Committing desktop application bug fixes found in during usability
testing.