Finish the retry button implem