Hotfix/ui

- Fixes UI in various parts of the app