Ui improvements

Depends on #389 should have only two commits.