Bugs/ui 03

Fixes #1458 
Fixes #1443