Ui tweaks

See commits for details