Re-organize context menu to move delete away from the top