Update modal to support new download changes
More changes to initial batch downloading