more UI refinements