diff --git a/_static/link_gen/link.js b/_static/link_gen/link.js
index dd371c81..fef4fa72 100644
--- a/_static/link_gen/link.js
+++ b/_static/link_gen/link.js
@@ -1,17 +1,21 @@
 // Pure function that generates an nbgitpuller URL
-function generateRegularUrl(hubUrl, urlPath, repoUrl, branch) {
+function generateRegularUrl(hubUrl, urlPath, repoUrl, branch, compressed, contentProvider) {
 
     // assume hubUrl is a valid URL
     var url = new URL(hubUrl);
 
     url.searchParams.set('repo', repoUrl);
-
+    if(compressed) {
+        url.searchParams.set('contentProvider', contentProvider);
+    }
     if (urlPath) {
         url.searchParams.set('urlpath', urlPath);
     }
 
     if (branch) {
         url.searchParams.set('branch', branch);
+    } else if(contentProvider == "git"){
+        url.searchParams.set('branch', "main");
     }
 
     if (!url.pathname.endsWith('/')) {
@@ -22,20 +26,24 @@ function generateRegularUrl(hubUrl, urlPath, repoUrl, branch) {
     return url.toString();
 }
 
-function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch) {
+function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch, compressed, contentProvider) {
     // assume hubUrl is a valid URL
     var url = new URL(hubUrl);
 
     var nextUrlParams = new URLSearchParams();
 
     nextUrlParams.append('repo', repoUrl);
-
+    if(compressed) {
+        nextUrlParams.append('contentProvider', contentProvider);
+    }
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
     }
 
     if (branch) {
         nextUrlParams.append('branch', branch);
+    } else if(contentProvider == "git"){
+        nextUrlParams.append('branch', "main");
     }
 
     var nextUrl = '/hub/user-redirect/git-pull?' + nextUrlParams.toString();
@@ -49,27 +57,35 @@ function generateCanvasUrl(hubUrl, urlPath, repoUrl, branch) {
     return url.toString();
 }
 
-function generateBinderUrl(hubUrl, userName, repoName, branch, urlPath,
-    contentRepoUrl, contentRepoBranch) {
+function generateBinderUrl(hubUrl, userName, envRepoName, envGitBranch, urlPath,
+    contentGitRepoUrl, contentGitRepoBranch, compressed, contentProvider) {
 
     var url = new URL(hubUrl);
 
     var nextUrlParams = new URLSearchParams();
 
-    nextUrlParams.append('repo', contentRepoUrl);
+    nextUrlParams.append('repo', contentGitRepoUrl);
 
+    if(compressed) {
+        nextUrlParams.append('contentProvider', contentProvider);
+    }
     if (urlPath) {
         nextUrlParams.append('urlpath', urlPath);
     }
 
-    if (contentRepoBranch) {
-        nextUrlParams.append('branch', contentRepoBranch);
+    if (contentGitRepoBranch) {
+        nextUrlParams.append('branch', contentGitRepoBranch);
+    } else if(contentProvider == "git"){
+        nextUrlParams.append('branch', "main");
     }
 
+    if(envGitBranch == ""){
+        envGitBranch = "main"
+    }
     var nextUrl = 'git-pull?' + nextUrlParams.toString();
 
     var path = '/v2/gh/';
-    url.pathname = path.concat(userName, "/", repoName, "/", branch);
+    url.pathname = path.concat(userName, "/", envRepoName, "/", envGitBranch);
     url.searchParams.append('urlpath', nextUrl);
 
     return url.toString();
@@ -100,37 +116,37 @@ var apps = {
     }
 }
 
+function clearLinks(){
+    document.getElementById('default-link').value = "";
+    document.getElementById('binder-link').value = "";
+    document.getElementById('canvas-link').value = "";
+}
+
 function changeTab(div) {
     var hub = document.getElementById("hub");
     var hub_help_text = document.getElementById("hub-help-text");
-    var env_repo = document.getElementById("repo");
-    var env_repo_branch = document.getElementById("branch");
-    var env_repo_help_text = document.getElementById("env-repo-help-text");
-    var content_repo = document.getElementById("content-repo-group");
-    var content_branch = document.getElementById("content-branch-group");
+    var env_repo_group = document.getElementById("env-repo-group");
+    var env_repo = document.getElementById("env-repo");
     var id = div.id;
-
+    var form = document.getElementById('linkgenerator');
+    clearLinks();
     if (id.includes("binder")) {
         hub.placeholder = "https://mybinder.org";
         hub.value = "https://mybinder.org";
         hub_help_text.hidden = true;
         hub.labels[0].innerHTML = "BinderHub URL";
-        env_repo.labels[0].innerHTML = "Git Environment Repository URL";
-        env_repo_help_text.hidden = false;
-        env_repo_branch.required = true;
-        env_repo_branch.pattern = ".+";
-        content_repo.hidden = false;
-        content_branch.hidden = false;
+        env_repo_group.style.display = '';
+        env_repo.disabled = false;
     } else {
         hub.placeholder = "https://hub.example.com";
+        hub.value = "";
         hub_help_text.hidden = false;
         hub.labels[0].innerHTML = "JupyterHub URL";
-        env_repo.labels[0].innerHTML = "Git Repository URL";
-        env_repo_help_text.hidden = true;
-        env_repo_branch.required = false;
-        content_repo.hidden = true;
-        content_branch.hidden = true;
+        
+        env_repo_group.style.display = 'none';
+        env_repo.disabled = true;
     }
+    displayContentProvider();
 }
 
 /**
@@ -139,58 +155,116 @@ function changeTab(div) {
  * nbgitpuller needs to redirect users to *inside* the directory it
  * just cloned. We copy the logic git itself uses to determine that.
  * See https://github.com/git/git/blob/1c52ecf4ba0f4f7af72775695fee653f50737c71/builtin/clone.c#L276
+ *
+ * The condition on the first line of this function ensures the user has not included a forward slash at the end of
+ * the URL. If they do, it is removed so that the rest of the function can split by forward slash and parse the name
+ * of directory from the URL.
+ *
+ * @param {string} gitCloneUrl This is the url to the git repo
  */
 function generateCloneDirectoryName(gitCloneUrl) {
+    if(gitCloneUrl.slice(-1) == "/")
+        gitCloneUrl = gitCloneUrl.slice(0,-1);
     var lastPart = gitCloneUrl.split('/').slice(-1)[0];
     return lastPart.split(':').slice(-1)[0].replace(/(\.git|\.bundle)?/, '');
 }
 
+/**
+ * This takes the values from the UI for content providers and sets three values in a
+ * json object(contentProviderUrl, branch, and compressed) based on what contentProvider is selected in the UI.
+ *
+ * The args contains the contentProvider selected in the UI as well as whatever text(if any)
+ * is in each of the content provider URL(e.g. driveURL, dropURL) text boxes, as well as the contentGitBranch.
+ *
+ * The return value is a a json object containing the branch, which may be an empty string if git is not the content
+ * provider, the contentProviderURL, and a boolean key, compressed, that indicates if you our notebooks are in a
+ * compressed archive.
+ *
+ * @param {json} args - contains UI element values for content providers(url, git branch,
+ */
+function configureContentProviderAttrs(args){
+  contentProvider = args["contentProvider"];
+  branch = "";
+  compressed = true;
+  contentProviderURL ="";
+  if(contentProvider == "git"){
+      contentProviderURL = args["contentGitRepoUrl"];
+      branch = args["contentGitRepoBranch"];
+      compressed = false;
+  } else if(contentProvider == "googledrive"){
+      contentProviderURL = args["driveUrl"];
+  } else if(contentProvider == "dropbox"){
+      contentProviderURL =  args["dropUrl"];
+  } else if(contentProvider == "generic_web"){
+      contentProviderURL =  args["webUrl"];
+  }
+  return {
+      "branch": branch,
+      "contentProviderURL": contentProviderURL,
+      "compressed": compressed
+  }
+}
+
 function displayLink() {
     var form = document.getElementById('linkgenerator');
-
     form.classList.add('was-validated');
     if (form.checkValidity()) {
         var hubUrl = document.getElementById('hub').value;
-        var repoUrl = document.getElementById('repo').value;
-        var branch = document.getElementById('branch').value;
-        var contentRepoUrl = document.getElementById('content-repo').value;
-        var contentRepoBranch = document.getElementById('content-branch').value;
+        var driveUrl = document.getElementById('drive-url').value;
+        var dropUrl = document.getElementById('drop-url').value;
+        var webUrl = document.getElementById('generic-web-url').value;
+        var envGitRepoUrl = document.getElementById('env-repo').value;
+        var envGitBranch = document.getElementById('env-branch').value;
+        var contentGitRepoUrl = document.getElementById('content-repo').value;
+        var contentGitRepoBranch = document.getElementById('content-branch').value;
         var filePath = document.getElementById('filepath').value;
         var appName = form.querySelector('input[name="app"]:checked').value;
         var activeTab = document.querySelector(".nav-link.active").id;
-
+        var contentProvider = form.querySelector('input[name="content-provider"]:checked').value;
+        
         if (appName === 'custom') {
             var urlPath = document.getElementById('urlpath').value;
         } else {
-            var repoName = generateCloneDirectoryName(repoUrl);
-            var urlPath;
-            if (activeTab === "tab-auth-binder") {
-                var contentRepoName = new URL(contentRepoUrl).pathname.split('/').pop().replace(/\.git$/, '');
-                urlPath = apps[appName].generateUrlPath(contentRepoName + '/' + filePath);
-            } else {
-                urlPath = apps[appName].generateUrlPath(repoName + '/' + filePath);
+            var envGitRepoName = generateCloneDirectoryName(envGitRepoUrl);
+            var contentGitRepoName = generateCloneDirectoryName(contentGitRepoUrl);
+            var partialUrlPath = contentGitRepoName + '/' + filePath;
+            if(contentProvider !== "git"){
+                contentGitRepoName = "";
+                partialUrlPath = filePath;
             }
+            var urlPath = apps[appName].generateUrlPath(partialUrlPath);
         }
-
+        args = {
+            "contentProvider": contentProvider,
+            "contentGitRepoUrl": contentGitRepoUrl,
+            "contentGitRepoBranch": contentGitRepoBranch,
+            "driveUrl": driveUrl,
+            "dropUrl": dropUrl,
+            "webUrl": webUrl
+        }
+        config = configureContentProviderAttrs(args)
         if (activeTab === "tab-auth-default") {
             document.getElementById('default-link').value = generateRegularUrl(
-                hubUrl, urlPath, repoUrl, branch
+                hubUrl, urlPath, config["contentProviderURL"], config["branch"], config["compressed"], contentProvider
             );
         } else if (activeTab === "tab-auth-canvas"){
             document.getElementById('canvas-link').value = generateCanvasUrl(
-                hubUrl, urlPath, repoUrl, branch
+                hubUrl, urlPath, config["contentProviderURL"], config["branch"], config["compressed"], contentProvider
             );
         } else if (activeTab === "tab-auth-binder"){
             // FIXME: userName parsing using new URL(...) assumes a 
             // HTTP based repoUrl. Does it make sense to create a
             // BinderHub link for SSH URLs? Then let's fix this parsing.
-            var userName = new URL(repoUrl).pathname.split('/')[1];
+            var userName = new URL(envGitRepoUrl).pathname.split('/')[1];
             document.getElementById('binder-link').value = generateBinderUrl(
-                hubUrl, userName, repoName, branch, urlPath, contentRepoUrl, contentRepoBranch
+                hubUrl, userName, envGitRepoName, envGitBranch, urlPath, config["contentProviderURL"], config["branch"], config["compressed"], contentProvider
             );
         }
+    } else {
+        clearLinks();
     }
 }
+
 function populateFromQueryString() {
     // preseed values if specified in the url
     var params = new URLSearchParams(window.location.search);
@@ -213,6 +287,35 @@ function populateFromQueryString() {
     }
 }
 
+function hideShowByClassName(cls, hideShow){
+    [].forEach.call(document.querySelectorAll(cls), function (el) {
+        el.style.display = hideShow;
+        setDisabled = (hideShow == 'none')
+        $(el).find("input").each(function(){
+            $(this).prop("disabled", setDisabled);
+        });
+    });
+}
+/**
+ * Depending on the content provider selected this hides and shows the appropriate divs
+ *
+ */
+function displayContentProvider(){
+    var form = document.getElementById('linkgenerator');
+    var contentProvider = form.querySelector('input[name="content-provider"]:checked').value;
+    hideShowByClassName(".content-provider", 'none');
+
+    if(contentProvider == 'git'){
+        hideShowByClassName(".content-provider-git", '');
+    } else if(contentProvider == 'googledrive'){
+        hideShowByClassName(".content-provider-googledrive", '');
+    } else if(contentProvider == 'dropbox'){
+        hideShowByClassName(".content-provider-dropbox", '');
+    } else if(contentProvider =="generic_web"){
+        hideShowByClassName(".content-provider-generic-web", '');
+    }
+}
+
 /**
  * Main loop of the program.
  *
@@ -246,11 +349,19 @@ function render() {
  */
 function main() {
     // Hook up any changes in form elements to call render()
-    document.querySelectorAll('#linkgenerator input[type="radio"]').forEach(
+    document.querySelectorAll('#linkgenerator input[name="app"]').forEach(
         function (element) {
             element.addEventListener('change', render);
         }
     )
+    document.querySelectorAll('#linkgenerator input[name="content-provider"]').forEach(
+        function (element) {
+            element.addEventListener('change', function(){
+                displayContentProvider();
+                render();
+            });
+        }
+    )
     document.querySelectorAll('#linkgenerator input[type="text"], #linkgenerator input[type="url"]').forEach(
         function (element) {
             element.addEventListener('input', render);
@@ -270,6 +381,7 @@ function main() {
     }
 
     // Do an initial render, to make sure our disabled / enabled properties are correctly set
+    displayContentProvider();
     render();
 }
 
diff --git a/link.html b/link.html
index 57b9e8d4..62d76902 100644
--- a/link.html
+++ b/link.html
@@ -101,9 +101,9 @@ <h3 id="searchlabel">Quick search</h3>
         <div class="col pl-md-4 topbar-main">
             
             <button id="navbar-toggler" class="navbar-toggler ml-0" type="button" data-toggle="collapse"
-                data-toggle="tooltip" data-placement="bottom" data-target=".site-navigation" aria-controls="navbar-menu"
-                aria-expanded="true" aria-label="Toggle navigation" aria-controls="site-navigation"
-                title="Toggle navigation" data-toggle="tooltip" data-placement="left">
+                data-placement="bottom" data-target=".site-navigation" aria-controls="navbar-menu"
+                aria-expanded="true" aria-label="Toggle navigation"
+                title="Toggle navigation" >
                 <i class="fas fa-bars"></i>
                 <i class="fas fa-arrow-left"></i>
                 <i class="fas fa-arrow-up"></i>
@@ -111,7 +111,7 @@ <h3 id="searchlabel">Quick search</h3>
             
             
 <div class="dropdown-buttons-trigger">
-    <button id="dropdown-buttons-trigger" class="btn btn-secondary topbarbtn" aria-label="Download this page"><i
+    <button id="download-dropdown-buttons-trigger" class="btn btn-secondary topbarbtn" aria-label="Download this page"><i
             class="fas fa-download"></i></button>
 
     <div class="dropdown-buttons">
@@ -130,7 +130,7 @@ <h3 id="searchlabel">Quick search</h3>
             <!-- Source interaction buttons -->
 
 <div class="dropdown-buttons-trigger">
-    <button id="dropdown-buttons-trigger" class="btn btn-secondary topbarbtn"
+    <button id="source-repo-dropdown-buttons-trigger" class="btn btn-secondary topbarbtn"
         aria-label="Connect with source repository"><i class="fab fa-github"></i></button>
     <div class="dropdown-buttons sourcebuttons">
         <a class="repository-button"
@@ -204,7 +204,6 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
               <input type="text" readonly class="form-control form-control" id="binder-link" name="auth-binder-link" placeholder="Generated Binder link appears here...">
             </div>
           </div>
-          </ul>
         </div>
 
         <div class="form-group row">
@@ -222,15 +221,15 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
           </div>
         </div>
 
-        <div class="form-group row">
-          <label for="repo" class="col-sm-2 col-form-label">Git Repository URL</label>
+        <div class="form-group row content-provider-env" id="env-repo-group" style="display:none">
+          <label for="env-repo" class="col-sm-2 col-form-label">Git Environment Repository URL</label>
           <div class="col-sm-6">
-            <input class="form-control" type="text" id="repo" placeholder="https://github.com/example/test"
+            <input class="form-control" type="text" id="env-repo" disabled placeholder="https://github.com/example/test"
               oninput="displayLink()" required pattern="((git|https?)://.+|git@.+:.+)">
             <div class="invalid-feedback">
               Must be a valid git URL
             </div>
-            <small class="form-text text-muted" id="env-repo-help-text" hidden="true">
+            <small class="form-text text-muted" id="env-repo-help-text">
               The environment repository must have
               <a href="https://github.com/jupyterhub/nbgitpuller">nbgitpuller</a> installed.
             </small>
@@ -240,9 +239,9 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
               <div class="input-group-prepend">
                 <span class="input-group-text" id="branch-prepend-label">branch</span>
               </div>
-              <input name="branch" id="branch" type="text" class="form-control" value="master" aria-label="Branch Name" aria-describedby="branch-prepend-label">
-              <small class="form-text text-muted">
-                 Use <code>main</code> instead of <code>master</code> for
+              <input name="branch" id="env-branch" type="text" placeholder="main" aria-label="Branch Name" aria-describedby="branch-prepend-label">
+              <small id="default-repo-message" class="form-text text-muted">
+                 If left blank, the default branch of your repository is used. Also note, Github now names the default branch <code>main</code> instead of <code>master</code> on
                  <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">
                  new GitHub repositories</a>
               </small>
@@ -253,25 +252,95 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
           </div>
         </div>
 
-        <div class="form-group row" id="content-repo-group" hidden="true">
+        <div class="form-group row" id="app-content-provider">
+          <div class="col-sm-2 col-form-label">
+            <label>Notebook Content Provider</label>
+          </div>
+          <div class="col-sm-10">
+            <div class="form-check">
+              <input class="form-check-input" type="radio" name="content-provider" id="content-provider-git" value="git" checked>
+              <label class="form-check-label text-dark" for="content-provider-git">
+                Git Repository(eg. github)
+              </label>
+            </div>
+            <div class="form-check">
+              <input class="form-check-input" type="radio" name="content-provider" id="content-provider-googledrive" value="googledrive">
+              <label class="form-check-label text-dark" for="content-provider-googledrive">
+                Google Drive
+              </label>
+            </div>
+            <div class="form-check">
+              <input class="form-check-input" type="radio" name="content-provider" id="content-provider-dropbox" value="dropbox">
+              <label class="form-check-label text-dark" for="content-provider-dropbox">
+                Dropbox
+              </label>
+            </div>
+            <div class="form-check">
+              <input class="form-check-input" type="radio" name="content-provider" id="content-provider-generic-web" value="generic_web">
+              <label class="form-check-label text-dark" for="content-provider-generic-web">
+                Web(Public URL to archive)
+              </label>
+            </div>
+          </div>
+        </div>
+
+        
+        
+        <div class="form-group row content-provider content-provider-git" id="content-repo-group">
           <label for="content-repo" class="col-sm-2 col-form-label">Git Content Repository URL</label>
           <div class="col-sm-6">
             <input class="form-control" type="text" id="content-repo" placeholder="https://github.com/example/test"
-              oninput="displayLink()" pattern="((git|https?)://.+|git@.+:.+)">
+              oninput="displayLink()" required pattern="((git|https?)://.+|git@.+:.+)">
             <div class="invalid-feedback">
               Must be a valid git URL
             </div>
           </div>
           <div class="col-sm-4">
-            <div class="input-group" id="content-branch-group" hidden="true">
+            <div class="input-group" id="content-branch-group">
               <div class="input-group-prepend">
                 <span class="input-group-text" id="content-branch-prepend-label">branch</span>
               </div>
-              <input name="content-branch" id="content-branch" type="text" class="form-control" value="master" aria-label="Branch Name" aria-describedby="content-branch-prepend-label">
+              <input name="content-branch" id="content-branch" type="text" placeholder="main" aria-label="Branch Name" aria-describedby="content-branch-prepend-label">
+              <small id="default-content-message" class="form-text text-muted">
+                If left blank, the default branch of your repository is used. Also note, Github now names the default branch <code>main</code> instead of <code>master</code> on
+                <a href="https://github.blog/changelog/2020-10-01-the-default-branch-for-newly-created-repositories-is-now-main/">new GitHub repositories</a>
+              </small>
             </div>
           </div>
          </div>
 
+        <div class="form-group row content-provider content-provider-googledrive">
+          <label for="drive-url" class="col-sm-2 col-form-label">Google Drive Shared Link</label>
+          <div class="col-sm-10">
+            <input class="form-control" type="text" id="drive-url" placeholder="https://drive.google.com/file/d/1p3m0h5UGWdLkVVP0S1HpG2yeDlU/view?usp=sharing"
+              oninput="displayLink()" required pattern="https?:\/\/drive.google.com\/file\/.+">
+            <div class="invalid-feedback">
+              Must be a valid Google Drive URL
+            </div>
+          </div>
+        </div>
+
+        <div class="form-group row content-provider content-provider-dropbox">
+          <label for="drop-url" class="col-sm-2 col-form-label">Dropbox Shared Link</label>
+          <div class="col-sm-10">
+            <input class="form-control"  type="text" id="drop-url" placeholder="https://www.dropbox.com/s/w0q4eirtuht/example.tgz?dl=0"
+              oninput="displayLink()" required pattern="https?:\/\/.+dropbox.com\/.+">
+            <div class="invalid-feedback">
+              Must be a valid Dropbox URL (Note: all the common compression formats work(e.g. zip, tar, tgz, etc))
+            </div>
+          </div>
+        </div>
+
+        <div class="form-group row content-provider content-provider-generic-web">
+          <label for="generic-web-url" class="col-sm-2 col-form-label">Public URL to archive</label>
+          <div class="col-sm-10">
+            <input class="form-control" type="text" id="generic-web-url" placeholder="https://example.com/materials-sp20-external.zip"
+              oninput="displayLink()" required pattern="https?://.+">
+            <div class="invalid-feedback">
+              Must be a valid public URL (Note: all the common compression formats work(e.g. zip, tar, tgz, etc))
+            </div>
+          </div>
+        </div>
         <div class="form-group row" id="filepath-container">
           <label for="filepath" class="col-sm-2 col-form-label">File to open</label>
           <div class="col-sm-10">
@@ -285,9 +354,7 @@ <h1>nbgitpuller link generator<a class="headerlink" href="#nbgitpuller-link-gene
 
         <div class="form-group row" id="app-container">
           <div class="col-sm-2 col-form-label">
-            <label for="app" class=>Application to Open</label>
-            <small class="form-text text-muted">
-            </small>
+            <label>Application to Open</label>
           </div>
           <div class="col-sm-10">
             <div class="form-check">