Bugfixes and UI improvements

Signed-off-by: = <=>