Editing UI code improvements.