UI refinements, bug fixes