- some UI improvements