Fix retry button not working
Fix some control menu items