diff --git a/.gitignore b/.gitignore
index 52613f26..20c89072 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,5 +41,4 @@ test_position_paper.doc
 env/
 .vscode/
 
-huxley/service.json
-huxley-venv/
\ No newline at end of file
+huxley/service.json
\ No newline at end of file
diff --git a/huxley/www/js/components/AdvisorPaperView.js b/huxley/www/js/components/AdvisorPaperView.js
index a67f96a0..0fece48c 100644
--- a/huxley/www/js/components/AdvisorPaperView.js
+++ b/huxley/www/js/components/AdvisorPaperView.js
@@ -10,6 +10,7 @@ import React from "react";
 
 var { _accessSafe } = require("utils/_accessSafe");
 var { AssignmentStore } = require("stores/AssignmentStore");
+var { Button } = require("components/core/Button");
 var { CommitteeStore } = require("stores/CommitteeStore");
 var { CountryStore } = require("stores/CountryStore");
 var { CurrentUserStore } = require("stores/CurrentUserStore");
@@ -246,33 +247,25 @@ class AdvisorPaperView extends React.Component {
         var fileName = names ? names[names.length - 1] : null;
         var gradedFileName = fileName ? "graded_" + fileName : null;
         var downloadPaper = paper ? (
-          <a
-            className={cx({
-              button: true,
-              "button-small": true,
-              "button-green": true,
-              "rounded-small": true,
-            })}
+          <Button
+            color="green"
+            size="small"
             href={originalHrefData}
             download={fileName}
           >
             &#10515;
-          </a>
+          </Button>
         ) : null;
         var gradedPaper =
           paper && graded ? (
-            <a
-              className={cx({
-                button: true,
-                "button-small": true,
-                "button-blpaperue": true,
-                "rounded-small": true,
-              })}
+            <Button
+              color="green"
+              size="small"
               href={gradedHrefData}
               download={gradedFileName}
             >
               &#10515;
-            </a>
+            </Button>
           ) : null;
 
         var category1 = null;
diff --git a/huxley/www/js/components/PaperGradeTable.js b/huxley/www/js/components/PaperGradeTable.js
index b784b600..35fb3b0c 100644
--- a/huxley/www/js/components/PaperGradeTable.js
+++ b/huxley/www/js/components/PaperGradeTable.js
@@ -40,36 +40,28 @@ class PaperGradeTable extends React.Component {
       var fileName = fileNames[fileNames.length - 1];
       var gradedName = gradedHrefData ? "graded_" + fileName : null;
       var downloadGraded = gradedHrefData ? (
-        <a
-          className={cx({
-            button: true,
-            "button-large": true,
-            "button-green": true,
-            "rounded-small": true,
-          })}
+        <Button
+          color="green"
+          size="large"
           href={gradedHrefData}
           download={gradedName}
         >
           Download Graded
-        </a>
+        </Button>
       ) : null;
       buttons = (
         <div>
           <Button color="red" onClick={this._handleUnset}>
             Go Back
           </Button>
-          <a
-            className={cx({
-              button: true,
-              "button-large": true,
-              "button-green": true,
-              "rounded-small": true,
-            })}
-            href={hrefData}
+          <Button
+            color="green"
+            size="large"
+            href={gradedHrefData}
             download={fileName}
           >
             Download Original
-          </a>
+          </Button>
           {downloadGraded}
           <Button
             color="blue"
diff --git a/huxley/www/js/components/PaperSubmissionTable.js b/huxley/www/js/components/PaperSubmissionTable.js
index 7d101345..5df5d946 100644
--- a/huxley/www/js/components/PaperSubmissionTable.js
+++ b/huxley/www/js/components/PaperSubmissionTable.js
@@ -30,33 +30,25 @@ class PaperSubmissionTable extends React.Component {
       var fileNames = paper.file.split("/");
       var fileName = fileNames[fileNames.length - 1];
       var gradedButton = paper.graded ? (
-        <a
-          className={cx({
-            button: true,
-            "button-large": true,
-            "button-blue": true,
-            "rounded-small": true,
-          })}
+        <Button
+          size="large"
+          color="blue"  
           href={gradedHrefData}
           download={"graded_" + fileName}
         >
           Download Graded Paper
-        </a>
+        </Button>
       ) : null;
       buttons = (
         <div>
-          <a
-            className={cx({
-              button: true,
-              "button-large": true,
-              "button-green": true,
-              "rounded-small": true,
-            })}
+          <Button
+            size="large"
+            color="green"  
             href={hrefData}
             download={fileName}
           >
             Download Paper
-          </a>
+          </Button>
           {gradedButton}
         </div>
       );