Hide & show stuff in uploadTab instead of killing. Works better but still bugged.
Merge remote-tracking branch 'origin/dev' into dev