Minor improvement to estateeditform