Inline ordering and text editing fix