Adding more UI refinements