Ui fixes

- Fixes #1363
- Fixes #1056