Even more UI refinements.