diff --git a/package.json b/package.json
index e675173..d131578 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "website",
   "version": "0.1.0",
   "private": true,
-  "homepage": "https://www.CIS-522.github.io/website",
+  "homepage": "https://www.cis-522.github.io/website",
   "dependencies": {
     "@brainhubeu/react-carousel": "^1.10.30",
     "boostrap": "^2.0.0",
diff --git a/public/522_logo.ico b/public/522_logo.ico
deleted file mode 100644
index ed0f44f..0000000
Binary files a/public/522_logo.ico and /dev/null differ
diff --git a/src/App.js b/src/App.js
index d69f576..bd0af66 100644
--- a/src/App.js
+++ b/src/App.js
@@ -1,5 +1,6 @@
 import React from 'react';
 import Dev from './components/dev.js';
+import NotFound from './components/notfound.js';
 import ScrollToTop from './components/scrolltotop.js';
 import {HashRouter as Router, Route} from 'react-router-dom';
 import './App.css';
@@ -11,6 +12,7 @@ function App() {
       <ScrollToTop/>
       <div>
         <Route path="/" exact component={Dev} />
+        <Route path="/not-found" exact component={NotFound} />
       </div>
     </Router>
   );
diff --git a/src/components/notfound.js b/src/components/notfound.js
new file mode 100644
index 0000000..4ceaf08
--- /dev/null
+++ b/src/components/notfound.js
@@ -0,0 +1,28 @@
+import React, { Component } from 'react';
+import '../css/standard.css';
+import {Button} from 'react-bootstrap';
+
+
+class NotFound extends Component {
+  render() {
+    return (
+      <div className="landing-container">
+        <div className="dark-container" style={{height:"100vh"}}>
+            <h1>Oops! Looks like you've gotten stuck in a local minimum.</h1>
+            <h3>
+            This page either doesn't exist or is currently still
+            under construction. Please check back later for updates.
+            </h3>
+            <Button href= {process.env.PUBLIC_URL + "/"} variant="dark">
+            <h3>
+                Return Home
+            </h3>
+            </Button>
+        </div>
+      </div>
+      
+    );
+  }
+}
+
+export default NotFound;
diff --git a/src/components/resources.js b/src/components/resources.js
index 692c9a6..0f66382 100644
--- a/src/components/resources.js
+++ b/src/components/resources.js
@@ -15,7 +15,7 @@ class Resources extends Component {
         <Row style={{paddingTop: "2%"}}>
 
           <Col md = {6} style={{paddingTop: "30px"}}>
-            <Button variant = "outline-dark" href = "https://d2l.ai/" target="blank_" style={{textAlign:"left", width: "100%", height: "100%", padding: "5%"}}>
+            <Button variant = "outline-dark" href = {process.env.PUBLIC_URL + "/#/not-found"} target="blank_" style={{textAlign:"left", width: "100%", height: "100%", padding: "5%"}}>
             <Row style={{backgroundColor: "rgba(0, 0, 0, 0)"}}>
               <Col md = {4}><img src={require("../public/github_logo.png")} style={{width: "140px", paddingBottom: "30px"}}></img></Col>
               <Col md = {8}>
@@ -27,7 +27,7 @@ class Resources extends Component {
           </Col>
 
           <Col md = {6} style={{paddingTop: "30px"}}>
-            <Button variant = "outline-dark" href = "https://d2l.ai/" target="blank_" style={{textAlign:"left", width: "100%", height: "100%", padding: "5%"}}>
+            <Button variant = "outline-dark" href = {process.env.PUBLIC_URL + "/#/not-found"} target="blank_" style={{textAlign:"left", width: "100%", height: "100%", padding: "5%"}}>
             <Row style={{backgroundColor: "rgba(0, 0, 0, 0)"}}>
               <Col md = {4}><img src={require("../public/piazza_logo.png")} style={{width: "100px", paddingBottom: "30px"}}></img></Col>
               <Col md = {8}>
@@ -41,7 +41,7 @@ class Resources extends Component {
           
 
           <Col md = {6} style={{paddingTop: "30px"}}>
-            <Button variant = "outline-dark" href = "https://d2l.ai/" target="blank_" style={{textAlign:"left", width: "100%", height: "100%", padding: "5%"}}>
+            <Button variant = "outline-dark" href = {process.env.PUBLIC_URL + "/#/not-found"} target="blank_" style={{textAlign:"left", width: "100%", height: "100%", padding: "5%"}}>
             <Row style={{backgroundColor: "rgba(0, 0, 0, 0)"}}>
               <Col md = {4}><img src={require("../public/crowdcast_logo.png")} style={{width: "120px", paddingBottom: "30px"}}></img></Col>
               <Col md = {8}>
@@ -53,7 +53,7 @@ class Resources extends Component {
           </Col>
 
           <Col md = {6} style={{paddingTop: "30px"}}>
-            <Button variant = "outline-dark" style={{textAlign:"left", width: "100%", height: "100%", padding: "5%"}}>
+            <Button variant = "outline-dark" href = "https://d2l.ai/" target="blank_" style={{textAlign:"left", width: "100%", height: "100%", padding: "5%"}}>
             <Row style={{backgroundColor: "rgba(0, 0, 0, 0)"}}>
               <Col md = {4}><img src={require("../public/d2l_logo.png")} style={{width: "120px", paddingBottom: "30px"}}></img></Col>
               <Col md = {8}>