UI fixes

- Fixes #1443
- Fixes #1444
- Fixes #1446
- Fixes #1418