Various refactorings and fixes in GUI due to latest API changes.

9 jobs for uploads in 17 minutes and 32 seconds (queued for 2 seconds)