Further UI refinement