Ui improvements

Sundry tweaks and bugfixes