Adding Retry/Remove all failed. And renaming the ones that use selection.