Feature/loom ui fixes

Merge new Loom UI with release/0.9.7