UI refinements and fixes