Bug fixes, mostly ui
Merge branch 'master' of https://github.com/mishabar/trivium