diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 257e8c6496309800f9181a427b0dd34a07e31b5c..48a714b9070ab11a4eca30fd8513363b42d1577c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -56,5 +56,6 @@ Go-py3.6:
   image: library/python:3.6
   type: test
   script:
+    - if pip list --outdated | grep "Latest" | wc -l > 0; then pip list --outdated && exit 1; else exit 0; fi
     - coverage run --source=go --omit=*migrations/*,*admin.py,*manage.py,*wsgi.py,*settings.py,*secret.py,*__init__.py,*.pyc,*templates/*,*static/* manage.py test
     - coverage html -i && grep pc_cov htmlcov/index.html | egrep -o "[0-9]+\%" | awk '{ print "covered " $1;}'
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 87054a9e61f266c3930e7e571bf24ad25d76d0fa..0b52de13ff2535e8cc5a2948a9531ec66b00d053 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,6 +1,7 @@
 # On Contributing
 
 ## git
+
 First take a look at [github flow](https://guides.github.com/introduction/flow/)
 as this page gives a good starting point on understanding how to work with `git`
 in an open source repo.
@@ -77,7 +78,13 @@ Example commit description:
 
 ### Merging to the current development branch
 
-Once you've finished work in a branch open a [pull request](https://git.gmu.edu/srct/go/merge_requests/new)
+Once you've finished work in a branch you will need to push your commits to gitlab.
+
+    git push origin ##-branchname
+
+`Origin` is gitlab.
+
+Open a [merge request](https://git.gmu.edu/srct/go/merge_requests/new)
 to start the process of getting your code into the repo. Your code wil be reviewed
 by another member before being merged. Your code must pass our tests and include
 in the description:
diff --git a/go/go/admin.py b/go/go/admin.py
index 78dcde5d33dba870e6dad8399be5b24593aeb3af..265d6dc98e2f2d2967c77637c04062277c5eab0c 100644
--- a/go/go/admin.py
+++ b/go/go/admin.py
@@ -12,7 +12,7 @@ from django.contrib.auth.admin import UserAdmin
 from django.contrib.auth.models import User
 
 # App Imports
-from go.models import URL, RegisteredUser
+from .models import URL, RegisteredUser
 
 class URLAdmin(admin.ModelAdmin):
     """
diff --git a/go/go/forms.py b/go/go/forms.py
index ecc6d98e89103713bdb4976cd50395512b806ee9..52ba369deaa345a418ccebb1200540e2ce169714 100644
--- a/go/go/forms.py
+++ b/go/go/forms.py
@@ -19,7 +19,7 @@ from django.utils import timezone
 from django.utils.safestring import mark_safe
 
 # App Imports
-from go.models import URL, RegisteredUser
+from .models import URL, RegisteredUser
 
 # Other Imports
 from bootstrap3_datetime.widgets import DateTimePicker
diff --git a/go/go/models.py b/go/go/models.py
index 49847714e55b0276d1f65dd181dbde9fd1201f5a..cffa0a3976947ad5d5c4051beb404d3b1d06e4e5 100644
--- a/go/go/models.py
+++ b/go/go/models.py
@@ -134,14 +134,13 @@ class URL(models.Model):
         """
         if cache.get("hashids_counter") is None:
             cache.set("hashids_counter", URL.objects.count())
-        cache.incr("hashids_counter")
-        short = HASHIDS.encrypt(cache.get("hashids_counter"))
         tries = 1
         while tries < 100:
             try:
-                URL.objects.get(short__iexact=short)
+                short = HASHIDS.encrypt(cache.get("hashids_counter"))
                 tries += 1
                 cache.incr("hashids_counter")
+                URL.objects.get(short__iexact=short)
             except URL.DoesNotExist as ex:
                 print(ex)
                 return short
diff --git a/go/go/templates/admin/useradmin.html b/go/go/templates/admin/useradmin.html
index 9f17378bd3141387f8e71cc045e9aa8020e0888f..21bb38be4466e3bc69bc35a6944d4cc289360b18 100644
--- a/go/go/templates/admin/useradmin.html
+++ b/go/go/templates/admin/useradmin.html
@@ -7,17 +7,20 @@
 <!-- define the content block for the page -->
 {% block content %}
 
+<!-- Tell Django to load static files -->
+{% load staticfiles %}
+
 <!-- define the page header div -->
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-balance-scale fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Moderation Panel</i>
-      </strong></h1>
+        Moderation Panel
+      </h1>
     </div>
   </div>
 </div>
@@ -309,8 +312,7 @@
     </form>
   </div>
 </div>
-<script src="../../static/js/useradmin.js">
 
-</script>
+<script src="{% static "js/useradmin.js" %}"></script>
 
 {% endblock %}
\ No newline at end of file
diff --git a/go/go/templates/banned.html b/go/go/templates/banned.html
index 30342f2a23e8b8cff1cdaadf99920c32bd452026..9b93283bf7b4927c7e148b2aae6334dcb2d10cab 100644
--- a/go/go/templates/banned.html
+++ b/go/go/templates/banned.html
@@ -10,13 +10,13 @@ SRCT Go &bull; Account Blocked
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-ban fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Account Is Blocked</i>
-      </strong></h1>
+        Account Is Blocked
+      </h1>
     </div>
   </div>
 </div>
@@ -32,10 +32,11 @@ SRCT Go &bull; Account Blocked
     <p>
       If you believe this is an error, please contact the <a href="mailto:srct@gmu.edu">Go Admins</a>
       <br />
-      <br/>
+      <br />
       Thank you, and have a nice day!
     </p>
-    <br/><br/>
+    <br />
+    <br />
   </div>
 </div>
 {% endblock %}
diff --git a/go/go/templates/core/about.html b/go/go/templates/core/about.html
index 0b047136e5e599c744d499abe1dcf254e161202c..69fd4d618d4f637d9fbdcad14177aa40777d854c 100644
--- a/go/go/templates/core/about.html
+++ b/go/go/templates/core/about.html
@@ -13,13 +13,13 @@ SRCT Go &bull; About
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-question fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">About</i>
-      </strong></h1>
+        About
+      </h1>
     </div>
   </div>
 </div>
@@ -27,12 +27,12 @@ SRCT Go &bull; About
 <!-- define the terms of use div -->
 <div class="row" id="terms">
   <div class="col-md-12">
-    <h4><i class="fa">Terms of Use</i></h4>
+    <h4>Terms of Use</h4>
     <legend></legend>
       <p>
         By using Go you acknowledge that you are a current George Mason Student or faculty member.
         <br></br>
-        Additionally any link that you create is subject to removal by Go admins if it is deemed
+        Additionally, any link that you create is subject to removal by Go admins if it is deemed
         to associate the univeristy with any
         <br />
         derogatory or controversial matters.
@@ -53,7 +53,7 @@ SRCT Go &bull; About
 <!-- define the who made go? div -->
 <div class="row">
   <div class="col-md-12">
-    <h4><i class="fa">Who made Go?</i></h4>
+    <h4>Who made Go?</h4>
     <legend></legend>
       <p>
         Members of the
@@ -77,7 +77,7 @@ SRCT Go &bull; About
 <!-- define the thanks! div -->
 <div class="row">
   <div class="col-md-12">
-    <h4><i class="fa">Thanks</i></h4>
+    <h4>Thanks</h4>
     <legend></legend>
     <p>
       This project was made possible through the collective contributions of multiple Mason SRCT members.
@@ -103,7 +103,7 @@ SRCT Go &bull; About
       <br></br>
       Go 1.0:
       <br />
-      <a href="https://github.com/jrouly">Michel Rouley</a>,
+      <a href="https://github.com/jrouly">Michel Rouly</a>,
       <a href="https://github.com/creffett">Chris Reffett</a>,
       <a href="https://github.com/nanderson94">Nicholas Anderson</a>,
       and <a href="https://github.com/akshaykarthik">Akshay Karthik</a>.
diff --git a/go/go/templates/core/edit_link.html b/go/go/templates/core/edit_link.html
index 7a34da568aa6cb3d88db9e7c567cc0519ef5b7fa..04ec563eda5cfbab61d006afd5e830da0a53c3ba 100644
--- a/go/go/templates/core/edit_link.html
+++ b/go/go/templates/core/edit_link.html
@@ -19,13 +19,13 @@ SRCT Go &bull; Edit Link
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-wrench fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Edit Link</i>
-      </strong></h1>
+        Edit Link
+      </h1>
     </div>
   </div>
 </div>
diff --git a/go/go/templates/core/index.html b/go/go/templates/core/index.html
index 2ecafe1ae6fb8c42103544e5372c4a0e9bac19a5..4b2c81bb8459b69e2821b8ba0aab6868d377435a 100644
--- a/go/go/templates/core/index.html
+++ b/go/go/templates/core/index.html
@@ -13,13 +13,13 @@ SRCT Go &bull; My Links
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-link fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">My Links</i>
-      </strong></h1>
+        My Links
+      </h1>
     </div>
   </div>
   <div class="newlink" style="text-align: right;">
diff --git a/go/go/templates/core/new_link.html b/go/go/templates/core/new_link.html
index 98d2c82bd1f66506ac2955f4706a4866a7867ca1..019207316fd31f832fa874cbd09dfccf3d33f5ef 100644
--- a/go/go/templates/core/new_link.html
+++ b/go/go/templates/core/new_link.html
@@ -19,13 +19,13 @@ SRCT Go &bull; New Link
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-link fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Shorten URL</i>
-      </strong></h1>
+        Shorten URL
+      </h1>
     </div>
   </div>
 </div>
diff --git a/go/go/templates/core/signup.html b/go/go/templates/core/signup.html
index ef5aa58afb9041cb3eff7e3c8dd8fd498aa23914..a5feb00bd513b486a6ab4349374bb5275cc0b56d 100644
--- a/go/go/templates/core/signup.html
+++ b/go/go/templates/core/signup.html
@@ -16,13 +16,13 @@ SRCT Go &bull; Apply
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-user-plus fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Apply to Go</i>
-      </strong></h1>
+        Apply to Go
+      </h1>
     </div>
   </div>
 </div>
diff --git a/go/go/templates/layouts/base.html b/go/go/templates/layouts/base.html
index e5271ad900829f4ac3705119cba4022c515ee87f..4b4034ba12dee6f76e40af58214135c7b7c7b0ed 100644
--- a/go/go/templates/layouts/base.html
+++ b/go/go/templates/layouts/base.html
@@ -6,55 +6,66 @@
 
 <!-- Start the HTML page for Go -->
 <html>
+  <!-- load in our header content for every page  -->
+  <head>
+    <!-- load in the title block defined on each html page -->
+    <title>
+      {% block title %}
+      {% endblock %}
+    </title>
 
-    <!-- load in our header content for every page  -->
-    <head>
-        <!-- load in the title block defined on each html page -->
-        <title>
-            {% block title %}
-            {% endblock %}
-        </title>
-
-        <!-- Some metadata -->
-        <meta charset="UTF-8">
-        <meta name="keywords" content="George Mason, URL shortener, URL">
-        <meta name="description" content="University branded URL shortener.">
-        <meta name="author" content="Mason SRCT">
-        <meta name="robots" content="all">
-        <meta name="viewport" content="width=device-width, initial-scale=1">
-        <meta name="theme-color" content="#006633">
-
-        <!-- Load in our icon -->
-        <link rel="icon" type="image/ico" href="{% static "img/favicon.ico"%}" />
-
-        <!-- Load in global CSS -->
-        <link href="https://fonts.googleapis.com/css?family=Carrois+Gothic"
-        rel="stylesheet" type="text/css">
-        <link
-        href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
-        rel="stylesheet">
-        <link rel="stylesheet" href="{% static "css/bootswatch.min.css" %}" />
-        <link rel="stylesheet" href="{% static "css/styles.css" %}" />
-
-        <!-- Load in global js -->
-        <script src="{% static "js/jquery.min.js" %}"></script>
-        <script src="{% static "js/bootstrap.min.js" %}"></script>
-        <script src="{% static "js/clipboard.min.js" %}"></script>
-    </head>
-
-    <!-- Load in the body of a Go page -->
-    <body>
-        <!-- Load in the navbar template -->
-        {% include 'layouts/navigation.html' %}
-
-        <!-- Wrap the page content in a container -->
-        <div class="container">
-            <!-- Load in the main page content -->
-            {% block content %}
-            {% endblock %}
-        </div>
-
-        <!-- Load in the footer template -->
-        {% include 'layouts/footer.html' %}
-    </body>
-</html>
+    <!-- Metatags -->
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge" />
+    <!-- Chrome on Android navbar color -->
+    <meta name="theme-color" content="#006633">
+    <!-- FB/Opengraph tags -->
+    <meta property="og:url" content="https://go.gmu.edu/">
+    <meta property="og:type" content="website">
+    <meta property="og:title" content="SRCT Go">
+    <!--<meta property="og:image" content="https://git.gmu.edu/uploads/project/avatar/10/noun_534670_cc.png">-->
+    <meta property="og:description" content="University-branded URL shortening.">
+    <meta property="og:site_name" content="SRCT Go">
+    <meta property="og:locale" content="en_US">
+    <meta property="article:author" content="SRCT">
+    <!-- Twitter card tags -->
+    <meta name="twitter:card" content="summary">
+    <meta name="twitter:site" content="@MasonSRCT">
+    <meta name="twitter:creator" content="@MasonSRCT">
+    <meta name="twitter:url" content="https://go.gmu.edu/">
+    <meta name="twitter:title" content="SRCT Gp">
+    <meta name="twitter:description" content="University-branded URL shortening.">
+    <!--<meta name="twitter:image" content="https://git.gmu.edu/uploads/project/avatar/10/noun_534670_cc.png">-->
+
+    <!-- Load in our icon -->
+    <link rel="icon" type="image/ico" href="{% static "img/favicon.ico" %}" />
+
+    <!-- Load in global CSS -->
+    <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css"
+      rel="stylesheet" type="text/css">
+    <link rel="stylesheet" href="{% static "css/bootswatch.min.css" %}" />
+    <link rel="stylesheet" href="{% static "css/styles.css" %}" />
+
+    <!-- Load in global JS -->
+    <script src="{% static "js/jquery.min.js" %}"></script>
+    <script src="{% static "js/bootstrap.min.js" %}"></script>
+    <script src="{% static "js/clipboard.min.js" %}"></script>
+  </head>
+
+  <!-- Load in the body of a Go page -->
+  <body>
+    <!-- Load in the navbar template -->
+    {% include 'layouts/navigation.html' %}
+
+    <!-- Wrap the page content in a bootstrap container -->
+    <div class="container">
+      <!-- Load in the main page content -->
+      {% block content %}
+      {% endblock %}
+    </div>
+
+    <!-- Load in the footer template -->
+    {% include 'layouts/footer.html' %}
+  </body>
+</html>
\ No newline at end of file
diff --git a/go/go/templates/layouts/footer.html b/go/go/templates/layouts/footer.html
index e2c1196045e8bdf7685e23d1772fed8e72769906..e6efae07eeaa23617dd9cd9f2400cc8ea6037f7e 100644
--- a/go/go/templates/layouts/footer.html
+++ b/go/go/templates/layouts/footer.html
@@ -1,7 +1,7 @@
 <!-- define the footer template -->
 <footer class="footer">
 	<!-- note: this is a special css class (see styles.css) -->
-	<div class="text-center valign-center">
+	<div class="hidden-xs text-center valign-center">
 	  <span class="text-muted">A project of
 	    <a href="http://srct.gmu.edu/">GMU<strong> SRCT</strong></a>. |
 			Read and contribute to our <a href="https://git.gmu.edu/srct/go/">source code</a>. |
@@ -9,4 +9,19 @@
 			Go Version 2.1.1
 		</span>
 	</div>
+
+	<div class="container text-center hidden-sm hidden-md hidden-lg">
+		<div class="col-sm-4 text-muted">
+			A project of <a href="http://srct.gmu.edu/">GMU<strong> SRCT</strong></a>.
+		</div>
+		<div class="col-sm-4 text-muted">
+			Read and contribute to our <a href="https://git.gmu.edu/srct/go/">source code</a>.
+		</div>
+		<div class="col-sm-4 text-muted">
+			Freely-licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache 2.0</a>.
+		</div>
+		<div class="col-sm-4 text-muted">
+			Go Version 2.1.1
+		</div>
+	</div>
 </footer>
diff --git a/go/go/templates/layouts/navigation.html b/go/go/templates/layouts/navigation.html
index 17bc93d14a87b78fbaaca00a4afc18f7badabdbb..7039c61e7cc80de713464760910e2dadd87619cc 100644
--- a/go/go/templates/layouts/navigation.html
+++ b/go/go/templates/layouts/navigation.html
@@ -14,7 +14,7 @@
         </button>
         <!-- Go brand logo -->
         <a class="navbar-brand" href="{% url 'index' %}">
-            <i class="fa fa-link"> Go</i>
+            <i class="fa fa-link"></i> Go
         </a>
     </div>
 
diff --git a/go/go/templates/link_box.html b/go/go/templates/link_box.html
index 8812062c61ee5b44f653dbd02001258ac061f555..e0842306e023db7247471fe0bf73ec2ed1117e2c 100644
--- a/go/go/templates/link_box.html
+++ b/go/go/templates/link_box.html
@@ -97,12 +97,12 @@
             <br></br>
             
             <!-- Delete Button  -->
-            <a class="button btn btn-danger btn-sm fa" data-target="#deletionModal-{{url.short}}" data-toggle="modal">
+            <a class="button btn btn-danger btn-sm" data-target="#deletionModal-{{url.short}}" data-toggle="modal">
                 <i class="fa fa-trash-o fa-lg"></i> Delete
             </a>
 
             <!-- Edit Button -->
-            <a href="{{domain}}edit/{{url.short}}" class="button btn btn-info btn-sm fa">
+            <a href="{{domain}}edit/{{url.short}}" class="button btn btn-info btn-sm">
                 <i class="fa fa-cog fa-lg"></i> Edit
             </a>
 
diff --git a/go/go/templates/not_registered.html b/go/go/templates/not_registered.html
index fc38a68c54ce864a345e472d717f6ebbd3def1c5..6840e11535aa8300d3ce66cab9f428cb66653dcf 100644
--- a/go/go/templates/not_registered.html
+++ b/go/go/templates/not_registered.html
@@ -13,13 +13,13 @@ SRCT Go &bull; Account Not Approved
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-ban fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Account Not Approved</i>
-      </strong></h1>
+        Account Not Approved
+      </h1>
     </div>
   </div>
 </div>
diff --git a/go/go/templates/public_landing.html b/go/go/templates/public_landing.html
index 3fe32df3e00fb72649a948a4e890d92b7204fd88..9ea6008abcad43620b452657d775053a68b3ee8a 100644
--- a/go/go/templates/public_landing.html
+++ b/go/go/templates/public_landing.html
@@ -27,7 +27,7 @@ SRCT Go &bull; Welcome
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-        <h1><i class="fa"><i class="fa fa-link"></i> Go</i></h1>
+        <h1><i class="fa fa-link"></i> Go</h1>
         <p class="lead">University-branded URL shortening</p>
     </div>
   </div>
@@ -37,7 +37,7 @@ SRCT Go &bull; Welcome
 <div class="row">
     <!-- what is go? -->
     <div class="col-md-4">
-        <h3><i class="fa">What is Go?</i></h3>
+        <h3>What is Go?</h3>
         <legend></legend>
         <p>
             Go provides University-branded URL shortening for student  organizations,
@@ -46,14 +46,14 @@ SRCT Go &bull; Welcome
             that can redirect to a longer URL.
             <br></br>
             Go is a product of the
-            George Mason University <a href="https://srct.gmu.edu">Student-Run  Computing and Technology</a>
+            George Mason University <a href="https://srct.gmu.edu">Student-Run Computing and Technology</a>
             student organization.
         </p>
     </div>
 
     <!-- why should I use Go? -->
     <div class="col-md-4">
-        <h3><i class="fa">Why should I use Go?</i></h3>
+        <h3>Why should I use Go?</h3>
         <legend></legend>
         <p>Go features:</p>
         <ul class="fa-ul">
@@ -78,7 +78,7 @@ SRCT Go &bull; Welcome
 
     <!-- how do I access Go? -->
     <div class="col-md-4">
-        <h3><i class="fa">How do I access Go?</i></h3>
+        <h3>How do I access Go?</h3>
         <legend></legend>
         <p>
             In order to prevent abuse of the URL shortener, access to Go
@@ -96,11 +96,11 @@ SRCT Go &bull; Welcome
 <!-- carefully formatted login and signup buttons  -->
 <!-- https://files.slack.com/files-pri/T025B796J-F0KPTCTD3/spin-dhaynes-buttons.gif -->
 <div class="fix row">
-    <div class="col-md-offset-1 col-md-4" "col-md-offset-2 col-md-4">
+    <div class="col-md-offset-1 col-md-4">
         <a href="{% url 'go_login' %}" class="btn btn-primary btn-block">Log In</a>
     </div>
 
-    <div class="col-md-offset-1 col-md-4 col-md-offset-2 col-md-4">
+    <div class="col-md-offset-1 col-md-4">
         <a href="{% url 'signup' %}" class="btn btn-primary btn-block">Sign Up</a>
     </div>
 </div>
diff --git a/go/go/templates/registered.html b/go/go/templates/registered.html
index 46d20cb68b042c246c2e67c93a3665c46b6a9072..229073a05f5fbab93675897142218db6ac717c5c 100644
--- a/go/go/templates/registered.html
+++ b/go/go/templates/registered.html
@@ -13,13 +13,13 @@ SRCT Go &bull; Registration Email Sent
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-envelope-o fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Registration Email Sent</i>
-      </strong></h1>
+        Registration Email Sent
+      </h1>
     </div>
   </div>
 </div>
diff --git a/go/go/templates/view.html b/go/go/templates/view.html
index 7a246b0a33ab64f0d29e42c53349702de65c4f6a..7f76635322169c95be3b27837a6435dcdab506e0 100644
--- a/go/go/templates/view.html
+++ b/go/go/templates/view.html
@@ -13,13 +13,13 @@ SRCT Go &bull; Link View
 <div class="page-header" id="banner">
   <div class="row">
     <div class="col-md-12">
-      <h1><strong>
+      <h1>
         <span class="fa-stack fa-lg">
           <i class="fa fa-circle fa-stack-2x"></i>
           <i class="fa fa-link fa-stack-1x fa-inverse"></i>
         </span>
-        <i class="fa">Link View</i>
-      </strong></h1>
+        Link View
+      </h1>
     </div>
   </div>
 </div>
diff --git a/go/go/test_cas_callbacks.py b/go/go/test_cas_callbacks.py
index b50b16828b788502beec318c21b8ee82ed3c97df..7b79a80dc37fc4fc3467e404e49d9549a92d3bec 100644
--- a/go/go/test_cas_callbacks.py
+++ b/go/go/test_cas_callbacks.py
@@ -6,7 +6,7 @@ from __future__ import (absolute_import, division, print_function,
 from django.test import TestCase
 
 # App Imports
-from go.cas_callbacks import pfparse, pfinfo
+from .cas_callbacks import pfparse, pfinfo
 
 class CasCallbacksTest(TestCase):
     """
diff --git a/go/go/test_forms.py b/go/go/test_forms.py
index d7c77ff410a8c1342609ecc971a0aba24111c6d8..e2572cc49fe7376c0b4be9052efb0783bfb4efbe 100644
--- a/go/go/test_forms.py
+++ b/go/go/test_forms.py
@@ -17,8 +17,8 @@ from django.contrib.auth.models import User
 from django.test import TestCase
 
 # App Imports
-from go.forms import SignupForm, URLForm, EditForm
-from go.models import URL, RegisteredUser
+from .forms import SignupForm, URLForm, EditForm
+from .models import URL, RegisteredUser
 
 class URLFormTest(TestCase):
     """
diff --git a/go/go/test_models.py b/go/go/test_models.py
index 59b58f9e3321f494f4391c43522d79e74732d011..5773adca0e2a9c43edf07788fa5d581bfafd4ac2 100644
--- a/go/go/test_models.py
+++ b/go/go/test_models.py
@@ -13,7 +13,7 @@ from django.test import TestCase
 from django.utils import timezone
 
 # App Imports
-from go.models import URL, RegisteredUser
+from .models import URL, RegisteredUser
 
 class RegisteredUserTest(TestCase):
     """
diff --git a/go/go/test_views.py b/go/go/test_views.py
index 2fa52ecc031d2f4bcf83f9ac5a60b86f8b374be3..ffcea7569a8ce4574011be21449e6feb56aa66c7 100644
--- a/go/go/test_views.py
+++ b/go/go/test_views.py
@@ -14,7 +14,7 @@ from django.contrib.auth.models import User
 from django.test import TestCase, Client
 
 # App Imports
-from go.models import URL, RegisteredUser
+from .models import URL, RegisteredUser
 
 class IndexTest(TestCase):
     """
diff --git a/go/go/views.py b/go/go/views.py
index b200d82d508835809bb0cc380627fd358b85deb9..a09392e3aa2ab776e40c9fa50933c44ea6bcdac7 100644
--- a/go/go/views.py
+++ b/go/go/views.py
@@ -24,8 +24,8 @@ from django.utils import timezone
 from ratelimit.decorators import ratelimit
 
 # App Imports
-from go.forms import SignupForm, URLForm, EditForm
-from go.models import URL, RegisteredUser
+from .forms import SignupForm, URLForm, EditForm
+from .models import URL, RegisteredUser
 
 
 def index(request):
@@ -329,7 +329,7 @@ def delete(request, short):
     url = get_object_or_404(URL, short__iexact=short)
 
     # If the RegisteredUser is the owner of the URL
-    if url.owner == request.user.registereduser:
+    if url.owner == request.user.registereduser and request.META['HTTP_REFERER'] == request.META['HTTP_HOST']:
         # remove the URL
         url.delete()
         # redirect to my_links
diff --git a/go/static/css/styles.css b/go/static/css/styles.css
index edebe9cdba1171724602d544f014f0865257db51..f0fe54ba60fcd33beea3e24718e6ea2224931a28 100644
--- a/go/static/css/styles.css
+++ b/go/static/css/styles.css
@@ -1,6 +1,10 @@
 html {
   position: relative;
   min-height: 100%;
+  font-family: -apple-system, BlinkMacSystemFont, 
+      "Segoe UI", "Roboto", "Oxygen", "Ubuntu", "Cantarell", 
+      "Fira Sans", "Droid Sans", "Helvetica Neue", 
+      sans-serif;
 }
 body {
   /* Margin bottom by footer height */
@@ -12,7 +16,6 @@ body {
   width: 100%;
   /* Set the fixed height of the footer here */
   height: 60px;
-  background-color: #f5f5f5;
 }
 .valign-center {
   height: 60px;
diff --git a/requirements/base.txt b/requirements/base.txt
index ac8c9a8b0931a9b95432f7b2db6001e3b6a4a1a8..2109cc741c0766290ab59583823257c9c6b9cf36 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -1,13 +1,14 @@
 Django>=1.11
-django-crispy-forms==1.6.0
+django-crispy-forms==1.6.1
 django-ratelimit==1.0.1
-django-redis-cache==1.6.4
-git+https://github.com/bruno207/django-qrcode.git
+django-redis-cache==1.7.1
+git+https://github.com/dhaynespls/django-qrcode.git
 git+https://github.com/kstateome/django-cas.git
-git+https://github.com/bruno207/django-bootstrap3-datetimepicker.git
-hashids==1.1.0
+git+https://github.com/dhaynespls/django-bootstrap3-datetimepicker.git
+hashids==1.2.0
 mysqlclient
 redis==2.10.5
-requests==2.11.0
-simplejson==3.8.2
+requests==2.13.0
+simplejson==3.10.0
 six
+setuptools==35.0.1
\ No newline at end of file
diff --git a/requirements/ci.txt b/requirements/ci.txt
index a8042c701114a0507161853c6b6555680d0f1364..1e57e33212d7baa20a39c8177ab147398793f3a8 100644
--- a/requirements/ci.txt
+++ b/requirements/ci.txt
@@ -1,6 +1,5 @@
 -r base.txt
-flake8==3.0.4
+flake8==3.3.0
 pep8==1.7.0
-pyflakes==1.2.3
+pyflakes==1.5.0
 coverage
-django-redis-cache==1.6.4
diff --git a/startup.sh b/startup.sh
index 41940e19eea64ab182c48c3edbe0b5b5b7cae3cd..531ccd2c5a588f65a7cf4d6200db7ae62e59ec3c 100755
--- a/startup.sh
+++ b/startup.sh
@@ -9,4 +9,5 @@ python go/manage.py makemigrations
 python go/manage.py makemigrations go
 python go/manage.py migrate
 python go/manage.py createsuperuser --noinput --username=$superuser --email=$superuser$GO_EMAIL_DOMAIN
+echo "from django.contrib.auth import get_user_model; User = get_user_model(); me = User.objects.get(username='$superuser'); me.first_name = 'David'; me.last_name = 'Haynes'; me.save(); " | python go/manage.py shell
 python go/manage.py runserver 0.0.0.0:8000