Some UI tweaks for #247