Ui tweaks

A couple changes (incl redmine 637) still need to get into master