diff --git a/imports/api/Documents/methods.js b/imports/api/Documents/methods.js
index 6a2140c..29fbd8b 100644
--- a/imports/api/Documents/methods.js
+++ b/imports/api/Documents/methods.js
@@ -24,8 +24,9 @@ Meteor.methods({
     });
 
     try {
-      Documents.update(doc._id, { $set: doc });
-      return doc._id; // Return _id so we can redirect to document after update.
+      const documentId = doc._id;
+      Documents.update(documentId, { $set: doc });
+      return documentId; // Return _id so we can redirect to document after update.
     } catch (exception) {
       throw new Meteor.Error('500', exception);
     }
diff --git a/imports/ui/components/AccountPageFooter/AccountPageFooter.scss b/imports/ui/components/AccountPageFooter/AccountPageFooter.scss
index 1808d64..0e6b0df 100644
--- a/imports/ui/components/AccountPageFooter/AccountPageFooter.scss
+++ b/imports/ui/components/AccountPageFooter/AccountPageFooter.scss
@@ -1,7 +1,7 @@
 @import '../../stylesheets/colors';
 
 .AccountPageFooter {
-  margin-top: 25px;
+  margin: 25px 0 0;
   padding-top: 20px;
   border-top: 1px solid $gray-lighter;
 }
diff --git a/imports/ui/components/Footer/Footer.js b/imports/ui/components/Footer/Footer.js
new file mode 100644
index 0000000..e5f61b6
--- /dev/null
+++ b/imports/ui/components/Footer/Footer.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import { year } from '@cleverbeagle/dates';
+import { Link } from 'react-router-dom';
+import { Grid } from 'react-bootstrap';
+
+import './Footer.scss';
+
+const copyrightYear = () => {
+  const currentYear = year();
+  return currentYear === '2017' ? '2017' : `2017-${currentYear}`;
+};
+
+const Footer = () => (
+  <div className="Footer">
+    <Grid>
+      <p className="pull-left">&copy; {copyrightYear()} Application Name</p>
+      <ul className="pull-right">
+        <li><Link to="/terms">Terms<span className="hidden-xs"> of Service</span></Link></li>
+        <li><Link to="/privacy">Privacy<span className="hidden-xs"> Policy</span></Link></li>
+      </ul>
+    </Grid>
+  </div>
+);
+
+Footer.propTypes = {};
+
+export default Footer;
diff --git a/imports/ui/components/Footer/Footer.scss b/imports/ui/components/Footer/Footer.scss
new file mode 100644
index 0000000..11110bc
--- /dev/null
+++ b/imports/ui/components/Footer/Footer.scss
@@ -0,0 +1,53 @@
+@import '../../stylesheets/mixins';
+@import '../../stylesheets/colors';
+
+html {
+  position: relative;
+  min-height: 100%;
+}
+
+body {
+  margin-bottom: 80px;
+}
+
+.Footer {
+  position: absolute;
+  bottom: 0;
+  width: 100%;
+  height: 60px;
+  background-color: #fff;
+  border-top: 1px solid $gray-lighter;
+  padding: 20px 0;
+
+  p {
+    color: $gray-light;
+  }
+
+  ul {
+    list-style: none;
+    padding: 0;
+  }
+
+  ul li {
+    float: left;
+
+    &:first-child {
+      margin-right: 15px;
+    }
+
+    a {
+      color: $gray-light;
+    }
+
+    a:hover {
+      text-decoration: none;
+      color: $gray;
+    }
+  }
+}
+
+@include breakpoint(tablet) {
+  .Footer ul li:first-child {
+    margin-right: 30px;
+  }
+}
diff --git a/imports/ui/layouts/App/App.js b/imports/ui/layouts/App/App.js
index 0d189d9..e3f1986 100644
--- a/imports/ui/layouts/App/App.js
+++ b/imports/ui/layouts/App/App.js
@@ -20,6 +20,9 @@ import RecoverPassword from '../../pages/RecoverPassword/RecoverPassword';
 import ResetPassword from '../../pages/ResetPassword/ResetPassword';
 import Profile from '../../pages/Profile/Profile';
 import NotFound from '../../pages/NotFound/NotFound';
+import Footer from '../../components/Footer/Footer';
+
+import './App.scss';
 
 const App = props => (
   <Router>
@@ -41,6 +44,7 @@ const App = props => (
           <Route component={NotFound} />
         </Switch>
       </Grid>
+      <Footer />
     </div> : ''}
   </Router>
 );
diff --git a/imports/ui/layouts/App/App.scss b/imports/ui/layouts/App/App.scss
new file mode 100644
index 0000000..4eb3984
--- /dev/null
+++ b/imports/ui/layouts/App/App.scss
@@ -0,0 +1,3 @@
+.App > .container {
+  margin-bottom: 20px;
+}
diff --git a/imports/ui/pages/Documents/Documents.js b/imports/ui/pages/Documents/Documents.js
index e084e58..1abffa6 100644
--- a/imports/ui/pages/Documents/Documents.js
+++ b/imports/ui/pages/Documents/Documents.js
@@ -73,7 +73,6 @@ Documents.propTypes = {
 
 export default createContainer(() => {
   const subscription = Meteor.subscribe('documents');
-  console.log(DocumentsCollection.find().fetch());
   return {
     loading: !subscription.ready(),
     documents: DocumentsCollection.find().fetch(),
diff --git a/package.json b/package.json
index 91774cb..ca9fff6 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@cleverbeagle/dates": "^0.2.0",
+    "@cleverbeagle/dates": "^0.4.0",
     "@cleverbeagle/seeder": "^1.1.0",
     "@cleverbeagle/strings": "^0.1.0",
     "babel-runtime": "^6.20.0",