Retry now works

you can retry if you suck and loose!
Tabs in system fix
Merge remote-tracking branch 'origin/master' into Poäng