Adhoc UI refinements