Further UI refinements, user editing