diff --git a/.eslintrc.js b/.eslintrc.js
index 403ca3e..15cd681 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -22,10 +22,6 @@ module.exports = {
             "error",
             4
         ],
-        "quotes": [
-            "error",
-            "single"
-        ],
         "semi": [
             "error",
             "always"
diff --git a/app/app.js b/app/app.js
index a31614b..bc83130 100644
--- a/app/app.js
+++ b/app/app.js
@@ -3,13 +3,15 @@ import ReactDOM from 'react-dom';
 import { Router, Route, IndexRoute, browserHistory } from 'react-router';
 
 import Wrapper from './Wrapper';
+import Home from './pages/Home/Home';
 import Soundboard from './pages/Soundboard/Soundboard';
 import NotFound from './pages/NotFound/NotFound';
 
 ReactDOM.render(
     <Router history={browserHistory}>
         <Route path="/" component={Wrapper}>
-            <IndexRoute component={Soundboard}/>
+            <IndexRoute component={Home}/>
+            <Route path="/soundboard" component={Soundboard}/>
             <Route path="*" component={NotFound}/>
         </Route>
     </Router>
diff --git a/app/components/Navbar/Navbar.component.js b/app/components/Navbar/Navbar.component.js
index 14be98a..6d67912 100644
--- a/app/components/Navbar/Navbar.component.js
+++ b/app/components/Navbar/Navbar.component.js
@@ -8,8 +8,9 @@ export default class Navbar extends React.Component {
     render() {
         return (
             <div className="Navbar">
-                <div className="Navbar__header">Sound<br/>Bot</div>
-                <Link to="/" className="Navbar__item" onlyActiveOnIndex activeClassName="Navbar__item--active">Soundboard</Link>
+                <div className="Navbar__header">Go Discord Bot</div>
+                <Link to="/" className="Navbar__item" onlyActiveOnIndex activeClassName="Navbar__item--active">Home</Link>
+                <Link to="/soundboard" className="Navbar__item" activeClassName="Navbar__item--active">Soundboard</Link>
             </div>
         );
     }
diff --git a/app/components/Navbar/Navbar.scss b/app/components/Navbar/Navbar.scss
index cf088b6..32a8a27 100644
--- a/app/components/Navbar/Navbar.scss
+++ b/app/components/Navbar/Navbar.scss
@@ -33,8 +33,7 @@
     justify-content: center;
     text-align: center;
     color: $white;
-    transition: background-color 0.1s linear;
-    transition: color 0.1s linear;
+    transition: background-color 0.1s linear, color 0.2s linear;
     
     &:hover {
         background-color: $gray1; 
diff --git a/app/pages/Home/Home.js b/app/pages/Home/Home.js
new file mode 100644
index 0000000..ab359e0
--- /dev/null
+++ b/app/pages/Home/Home.js
@@ -0,0 +1,26 @@
+import React from 'react';
+
+import './Home.scss';
+
+export default class Home extends React.Component {
+    render() {
+        return (
+            <div className="Home">
+                <div className="Card">
+                    <div className="Card__header">
+                        Go Discord Bot
+                    </div>
+                    <p>Drag and drop files to upload. Sounds can be played in discord by typing the commands on the next page.</p>
+                    <br/>
+                    <p>Gif command now supported! Example: !gif awesome cat gifs</p>
+                    <br/>
+                    <p>Check out the source code on 
+                        <a href="https://github.com/mgerb/GoBot" target="_blank"> GitHub 
+                            <i className="fa fa-github" aria-hidden="true"/>
+                        </a>
+                    </p>
+                </div>
+            </div>
+        );
+    }
+}
diff --git a/app/pages/Home/Home.scss b/app/pages/Home/Home.scss
new file mode 100644
index 0000000..2381ef4
--- /dev/null
+++ b/app/pages/Home/Home.scss
@@ -0,0 +1,3 @@
+.Home {
+    padding: 10px;
+}
diff --git a/app/pages/Soundboard/SoundList.component.js b/app/pages/Soundboard/SoundList.component.js
index 2e9f136..8f0bfff 100644
--- a/app/pages/Soundboard/SoundList.component.js
+++ b/app/pages/Soundboard/SoundList.component.js
@@ -9,6 +9,7 @@ export default class SoundList extends React.Component {
         super();
         this.state = {
             soundList: [],
+            showAudioControls: [],
         };
     }
     
@@ -18,15 +19,14 @@ export default class SoundList extends React.Component {
     
     getSoundList() {
         if (!this.soundListCache) {
-            axios.get("/soundlist")
-                .then((response) => {
-                    this.soundListCache = response.data;
-                    this.setState({
-                        soundList: response.data,
-                    });
-                }).catch((error) => {
-                    console.warn(error.response.data);
+            axios.get("/soundlist").then((response) => {
+                this.soundListCache = response.data;
+                this.setState({
+                    soundList: response.data,
                 });
+            }).catch(() => {
+                //console.warn(error.response.data);
+            });
         } else {
             this.setState({
                 soundList: this.soundListCache,
@@ -36,37 +36,48 @@ export default class SoundList extends React.Component {
     
     checkExtension(extension) {
         switch(extension) {
-            case "wav":
-                return true;
-            case "mp3":
-                return true;
-            case "mpeg":
-                return true;
-            default:
-                return false;
+        case "wav":
+            return true;
+        case "mp3":
+            return true;
+        case "mpeg":
+            return true;
+        default:
+            return false;
         }
     }
+
+    handleShowAudio(index) {
+        let temp = this.state.showAudioControls;
+        temp[index] = true;
+
+        this.setState({
+            showAudioControls: temp,
+        });
+    }
     
     render() {
         return (
             <div className="Card">
                 <div className="Card__header">
                     Sounds
-                <i className="fa fa fa-volume-up" aria-hidden="true"></i>
+                <i className="fa fa fa-volume-up" aria-hidden="true"/>
                 </div>
                 
                 {this.state.soundList.length > 0 ? this.state.soundList.map((sound, index) => {
-                    return <div key={index} className="SoundList__item">
-                        <div>
-                            {sound.prefix + sound.name}
+                    return (
+                        <div key={index} className="SoundList__item">
+                            <div>
+                                {sound.prefix + sound.name}
+                            </div>
+                            
+                            {this.checkExtension(sound.extension) && this.state.showAudioControls[index] ?
+                            <audio controls src={"/sounds/" + sound.name + "." + sound.extension}
+                                    type={"audio/" + sound.extension}
+                                    style={{width: "100px"}}/>
+                            : <i className="fa fa-play link" aria-hidden="true" onClick={() => this.handleShowAudio(index)}/> }
                         </div>
-                        
-                        {this.checkExtension(sound.extension) ?
-                        <audio controls src={"/sounds/" + sound.name + "." + sound.extension}
-                                type={"audio/" + sound.extension}
-                                style={{width: "100px"}}/>
-                        : null}
-                    </div>
+                    );
                 }) : null}
             </div>
         );
diff --git a/app/pages/Soundboard/Soundboard.js b/app/pages/Soundboard/Soundboard.js
index 04752f9..3c4b7e2 100644
--- a/app/pages/Soundboard/Soundboard.js
+++ b/app/pages/Soundboard/Soundboard.js
@@ -35,9 +35,9 @@ export default class Soundboard extends React.Component {
     }
     
     onDrop(acceptedFiles, rejectedFiles) {
-      if (acceptedFiles.length > 0) {
-          self.uploadFile(acceptedFiles[0]);
-      }
+        if (acceptedFiles.length > 0) {
+            self.uploadFile(acceptedFiles[0]);
+        }
     }
     
     uploadFile(file) {
@@ -47,7 +47,7 @@ export default class Soundboard extends React.Component {
         formData.append("password", this.state.password);
         
         axios.put("/upload", formData, this.config)
-            .then((response) => {
+            .then(() => {
                 this.setState({
                     password: "",
                     percentCompleted: 0,
@@ -77,18 +77,6 @@ export default class Soundboard extends React.Component {
         return (
             <div className="Soundboard">
                 <div className="column">
-                    <div className="Card">
-                        <div className="Card__header">
-                            Discord Sound Bot
-                        </div>
-                        <p>Drag and drop files to upload. The sounds can then be played in discord by typing the commands below.</p>
-                        <p>Check out the source code on 
-                            <a href="https://github.com/mgerb/GoBot" target="_blank"> GitHub 
-                                <i className="fa fa-github" aria-hidden="true"></i>
-                            </a>
-                        </p>
-                        <p>Follow the readme to set up your own bot!</p>
-                    </div>
                     <SoundList ref="SoundList"/>
                 </div>
             
diff --git a/app/scss/style.scss b/app/scss/style.scss
index 22c22e3..887bf1f 100644
--- a/app/scss/style.scss
+++ b/app/scss/style.scss
@@ -2,10 +2,11 @@
     box-sizing: border-box;
 }
 
-a {
+a, .link {
     text-decoration: none;    
     color: $primaryBlue;
     transition: color 0.1s linear;
+    cursor: pointer;
     
     &:hover {
         color: darken(white, 10%);
diff --git a/server/webserver/server.go b/server/webserver/server.go
index 5652997..aa0196e 100644
--- a/server/webserver/server.go
+++ b/server/webserver/server.go
@@ -1,11 +1,12 @@
 package webserver
 
 import (
+	"log"
+
 	"../config"
 	"./handlers"
 	"github.com/buaazp/fasthttprouter"
 	"github.com/valyala/fasthttp"
-	"log"
 )
 
 func logger(next fasthttp.RequestHandler) fasthttp.RequestHandler {
@@ -28,7 +29,7 @@ func registerRoutes(router *fasthttprouter.Router) {
 	router.PUT("/upload", handlers.FileUpload)
 
 	router.ServeFiles("/static/*filepath", "./static")
-	router.ServeFiles("/sounds/*filepath", "./sounds")
+	router.ServeFiles("/sounds/*filepath", config.Config.SoundsPath)
 
 	router.NotFound = func(ctx *fasthttp.RequestCtx) {
 		fasthttp.ServeFile(ctx, "./index.html")