ui tweaks
Merge branch 'feature/ionic' of https://github.com/mrede/Guff-V4 into feature/ionic
ui changes merged with working version
ui