Minor ui tweaks for #26 and #25