Fix for tri1575. Also resolves other issues in the app that resulted from changes in r2587.
Fix for tri1575. Also resolves other issues in the app that resulted from changes in r2587.

git-svn-id: 105a8f2fe5eb3dca76b21e204c69f6587dfa9961@2593 b21a84b9-e453-0410-92a3-c4f515f7ae45

csinitiative/trisano,csinitiative/trisano,csinitiative/trisano,csinitiative/trisano,csinitiative/trisano