Lots of fixes after walkthrough
Merge branch 'uiwork' of https://github.com/mikaelvonpfaler/iWitness into uiwork