work in progress UI
Merge branch 'DemoApp-UI' of github.com:Invenietis/yodii into DemoApp-UI