Simplification

- removing one level of code between data and xaml
- full data/view model accessible to xaml, easier customisation