Edit mode improvements