Enh: minor improvements in UI