UI refinement per comments