diff --git a/docs/_config.yml b/docs/_config.yml
index a3403f178..745811aae 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -1,5 +1,5 @@
-title: LibreTime Radio Automation
-description: An open source radio automation server made for (and made by) low-power FM stations and the rest of us.
+title: LibreTime 
+description: An open source radio automation server made for (and by) low-power FM stations and the rest of us.
 logo: 144px.png
 show_downloads: false
 
@@ -12,7 +12,7 @@ favicon:
 headimage: img/header.jpg
 headtext: Open Source Radio Automation
 headsubtext: Everything you need to get your terrestrial / on-line radio station up and broadcasting like a pro - without breaking the bank! 
-headbuttonurl: https://libretime.org
+headbuttonurl: index#get-started
 headbuttontext: Get LibreTime
 
 # Build settings
diff --git a/docs/_data/nav.yml b/docs/_data/nav.yml
index 03dbb5504..f3ec791af 100644
--- a/docs/_data/nav.yml
+++ b/docs/_data/nav.yml
@@ -3,8 +3,6 @@ topnav:
   url: quickstart
 - page: Features
   url: features
-- page: Tour
-  url: tour
 - page: Docs
   url: advanced-configuration
 - page: Contribute
@@ -36,6 +34,8 @@ docsnav:
     url: live-broadcast
   - page: Adding Users
     url: users
+  - page: Listen To Your Stream
+    url: listen
   - page: Help!
     url: troubleshooting
 - section: Advanced Configuration
diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
index 407b2ab95..9c9ff7ee3 100644
--- a/docs/_layouts/default.html
+++ b/docs/_layouts/default.html
@@ -8,6 +8,9 @@
     <!-- Bootstrap CSS -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/css/bootstrap.min.css" integrity="sha384-9aIt2nRpC12Uk9gS9baDl411NQApFmC26EwAOH8WgZl5MYYxFfc+NcPb1dKGj7Sk" crossorigin="anonymous">
     
+    <!-- Bootstrap Tables -->
+    <link rel="stylesheet" href="https://unpkg.com/bootstrap-table@1.16.0/dist/bootstrap-table.min.css">
+    
     <!-- Custom fonts for this template -->
     <link href="vendor/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
     <link href='https://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,300,600,700,800' rel='stylesheet' type='text/css'>
@@ -20,16 +23,6 @@
     <link href="css/creative.min.css" rel="stylesheet">
     
     <style>
-      header.masthead {
-      padding-top: 10rem;
-      padding-bottom: calc(10rem - 56px);
-      background-image: url("{{ site.headimage }}");
-      background-position: center center;
-      background-size: cover;
-      }
-      .bg-dark{
-        padding:2rem 0
-      }
     </style>
     
     <title>{{ site.title }} - {{ page.title }}</title>
@@ -62,7 +55,7 @@
     </div>
     
     <footer>
-      <section class="bg-dark text-white">
+      <section class="footer-dark text-white">
         <div class="text-footer">
           <small>Hosted on GitHub Pages &mdash; Theme by <a href="https://github.com/ned-kelly">ned-kelly</a> and <a href="https://github.com/zklosko">Zachary Klosko</a> &nbsp; | &nbsp;</small>
           <small>Code and docs licensed under GPLv2. More details <a href="http://sourcefabric.booktype.pro/airtime-25-for-broadcasters/about-this-manual/">here</a>. </small>
@@ -75,5 +68,6 @@
     <script src="https://code.jquery.com/jquery-3.5.1.slim.min.js" integrity="sha384-DfXdz2htPH0lsSSs5nCTpuj/zy4C+OGpamoFVy38MVBnE+IbbVYUew+OrCXaRkfj" crossorigin="anonymous"></script>
     <script src="https://cdn.jsdelivr.net/npm/popper.js@1.16.0/dist/umd/popper.min.js" integrity="sha384-Q6E9RHvbIyZFJoft+2mJbHaEWldlvI9IOYy5n3zV9zzTtmI3UksdQRVvoxMfooAo" crossorigin="anonymous"></script>
     <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.5.0/js/bootstrap.min.js" integrity="sha384-OgVRvuATP1z7JjHLkuOU7Xw704+h835Lr+6QL9UvYjZE3Ipu6Tp75j7Bh/kR0JKI" crossorigin="anonymous"></script>
+    <script src="https://unpkg.com/bootstrap-table@1.16.0/dist/bootstrap-table.min.js"></script>
   </body>
 </html>
diff --git a/docs/_layouts/docs.html b/docs/_layouts/docs.html
index cbab27dc8..e3d8291a9 100644
--- a/docs/_layouts/docs.html
+++ b/docs/_layouts/docs.html
@@ -24,42 +24,12 @@ layout: default
     <link href="css/creative.min.css" rel="stylesheet">
     
     <style>
-            /* "CONTENT" From Above */
        .content {
-       
             /* size of my container minus sidebar width */
            width: calc(80%);
-       
            /* Estimated height of largest sidebar in case of short content */
            min-height: 800px;
        }
-       
-       /* SIDEBAR */
-       .sidebar {
-           position: absolute;
-           right: 0;
-           top: 57px;
-           width: 20%;
-           height: 100%; /* Super important! */
-           background-color: #212529;
-           color: #fff;
-       }
-       .link-style {
-          color: rgba(255,255,255,.9);
-       }
-       /* SIDEBAR CONTAINER */
-      .sidebar-item {
-          position: absolute;
-          top: 5px;
-          left: 10%;
-          width: 100%;
-          height: 25%;
-      
-          /* Position the items */
-          &:nth-child(2) { top: 25%; }
-          &:nth-child(3) { top: 50%; }
-          &:nth-child(4) { top: 75%; }
-        }
     </style>
     
     <title>{{ site.title }} - {{ page.title }}</title>
@@ -86,15 +56,6 @@ layout: default
     </nav>
     
     <!-- Sidebar -->
-    <div id="sidebar">
-      <ul>
-        {% for item in site.data.nav.docsnav %}
-        <li class="nav-item">
-          <a class="nav-link" href="{{ item.url }}">{{ item.page }}</a>
-        </li>
-        {% endfor %}
-      </ul>
-    </div>
     
     <nav id="sidebar">
         <div class="sidebar-header">
diff --git a/docs/_layouts/splash.html b/docs/_layouts/splash.html
index c024dad6f..9cd9a4dc1 100644
--- a/docs/_layouts/splash.html
+++ b/docs/_layouts/splash.html
@@ -226,9 +226,9 @@
         <h5>Follow the docs, and you'll be off the ground in no time!</5>
 
         <div class="start-buttons" style="padding: 20px;">
-            <a class="btn btn-light btn-xl sr-button" target="_blank" href="quickstart">Quick Install</a>
+            <a class="btn btn-light btn-xl sr-button" href="quickstart">Quick Install</a>
            
-            <a class="btn btn-light btn-xl sr-button" target="_blank" href="vagrant">Vagrant</a>
+            <a class="btn btn-light btn-xl sr-button" href="vagrant">Vagrant</a>
 
             <a class="btn btn-light btn-xl sr-button" target="_blank" href="https://github.com/ned-kelly/docker-multicontainer-libretime/blob/master/README.md">Docker Deployment</a>
         </div>
@@ -269,7 +269,7 @@
     </section>
     
     <footer>
-      <section class="bg-dark text-white">
+      <section class="footer-dark text-white">
         <div class="text-footer">
           <small>Hosted on GitHub Pages &mdash; Theme by <a href="https://github.com/ned-kelly">ned-kelly</a> and <a href="https://github.com/zklosko">Zachary Klosko</a> &nbsp; | &nbsp;</small>
           <small>Code and docs licensed under GPLv2. More details <a href="http://sourcefabric.booktype.pro/airtime-25-for-broadcasters/about-this-manual/">here</a>. </small>
diff --git a/docs/css/creative.min.css b/docs/css/creative.min.css
index 9df05a83c..7b4c35685 100755
--- a/docs/css/creative.min.css
+++ b/docs/css/creative.min.css
@@ -22,7 +22,7 @@ hr.light{
   
 img{
  width:100%;
- max-width: 600px;
+ max-width: 700px;
 }
   
 a{
@@ -38,7 +38,22 @@ a:hover{
 h1,h2,h3,h4,h5,h6{
   font-family:'Open Sans','Helvetica Neue',Arial,sans-serif
   }
-  
+
+/* Table Properties */
+table{
+ border: 2px solid #f05f40;
+}
+
+th{
+ background-color: #f05f40
+}
+ 
+tr, td{
+ padding: 15px;
+ text-align: left;
+}
+
+/* Theme Colors */  
 .bg-primary{
   background-color:#f05f40!important
   }
@@ -47,6 +62,11 @@ h1,h2,h3,h4,h5,h6{
   background-color:#212529!important
   }
   
+.footer-dark{
+ background-color:#212529!important;
+ padding:2rem 0
+  }
+  
 .text-faded{
   color:rgba(255,255,255,.9)
   }
@@ -107,55 +127,6 @@ img::-moz-selection{color:#fff;background:0 0}
 #mainNav.navbar-shrink .navbar-nav>li.nav-item>a.nav-link:focus:hover,
 #mainNav.navbar-shrink .navbar-nav>li.nav-item>a.nav-link:hover{color:#f05f40}}
 
-/* CSS for docs navbar*/ 
-#docsNav{
-  border-bottom:1px solid rgba(33,37,41,.1);
-  background-color:#fff;
-  font-family:'Open Sans','Helvetica Neue',Arial,sans-serif;
-  -webkit-transition:all .2s;
-  transition:all .2s
-  } 
- 
-#docsNav .navbar-brand{
-  font-weight:650;
-  text-transform:uppercase;
-  color:#f05f40;
-  font-family:'Open Sans','Helvetica Neue',Arial,sans-serif
-  }
-
-#docsNav .navbar-brand:focus,
-#docsNav .navbar-brand:hover{color:#f05f40}
-#docsNav .navbar-nav>li.nav-item>a.nav-link,
-#docsNav .navbar-nav>li.nav-item>a.nav-link:focus{
-  font-size:.8rem;font-weight:650;text-transform:uppercase;color:#212529
-  }
-#docsNav .navbar-nav>li.nav-item>a.nav-link:focus:hover,
-#docsNav .navbar-nav>li.nav-item>a.nav-link:hover{color:#f05f40}
-#docsNav .navbar-nav>li.nav-item>a.nav-link.active,
-#docsNav .navbar-nav>li.nav-item>a.nav-link:focus.active{color:#f05f40!important;background-color:transparent}
-#docsNav .navbar-nav>li.nav-item>a.nav-link.active:hover,
-#docsNav .navbar-nav>li.nav-item>a.nav-link:focus.active:hover{background-color:transparent}
-
-@media (min-width:992px){
-  #docsNav{border-color:transparent;background-color:transparent
-  }
-  
-#docsNav .navbar-brand{color:rgba(255,255,255,.7)}
-#docsNav .navbar-brand:focus,#docsNav .navbar-brand:hover{color:#fff}
-#docsNav .navbar-nav>li.nav-item>a.nav-link{padding:.5rem 1rem}
-#docsNav .navbar-nav>li.nav-item>a.nav-link,
-#docsNav .navbar-nav>li.nav-item>a.nav-link:focus{color:rgba(255,255,255,.7)}
-#docsNav .navbar-nav>li.nav-item>a.nav-link:focus:hover,
-#docsNav .navbar-nav>li.nav-item>a.nav-link:hover{color:#fff}
-#docsNav.navbar-shrink{border-bottom:1px solid rgba(33,37,41,.1);background-color:#fff}
-#docsNav.navbar-shrink .navbar-brand{color:#f05f40}
-#docsNav.navbar-shrink .navbar-brand:focus,
-#docsNav.navbar-shrink .navbar-brand:hover{color:#f05f40}
-#docsNav.navbar-shrink .navbar-nav>li.nav-item>a.nav-link,
-#docsNav.navbar-shrink .navbar-nav>li.nav-item>a.nav-link:focus{color:#212529}
-#docsNav.navbar-shrink .navbar-nav>li.nav-item>a.nav-link:focus:hover,
-#docsNav.navbar-shrink .navbar-nav>li.nav-item>a.nav-link:hover{color:#f05f40}}
-
 header.masthead{
   padding-top:10rem;padding-bottom:calc(10rem - 56px);
   background-image:url(../img/header.jpg);
@@ -248,6 +219,22 @@ color: brown;
 text-align: right;
 }
 
+/* Code Blocks */
+code {
+color: gray;
+font-size: .9rem;
+}
+
+pre.highlight {
+border: 1px solid #212529;
+border-left: 10px solid #212529;
+background: white;
+color: black;
+font-size: .9rem;
+margin: 10px;
+padding: 10px 20px;
+}
+
 /* Sidebar */
 #sidebar {
  position: absolute;
diff --git a/docs/features.md b/docs/features.md
index ed138e19d..3f41b0544 100644
--- a/docs/features.md
+++ b/docs/features.md
@@ -4,8 +4,6 @@ title: Features
 blurb: 
 ---
 
-![](img/Calendar-with-shows.jpg)
-
 Some of LibreTime's greatest hits:
 
 * *Web-based remote station management* - authorized personnel can add
diff --git a/docs/index.md b/docs/index.md
index 0da899003..3019e6396 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,3 +1,4 @@
 ---
 layout: splash
+title: Home
 ---
\ No newline at end of file
diff --git a/docs/tour.md b/docs/listen.md
similarity index 96%
rename from docs/tour.md
rename to docs/listen.md
index 6d549e68e..070a9224d 100644
--- a/docs/tour.md
+++ b/docs/listen.md
@@ -1,7 +1,5 @@
 ---
-layout: page
-title: Interface Tour
-blurb: See what LibreTime can do!
+layout: docs
 ---
 
 ## Listen
diff --git a/docs/my-podcast.md b/docs/my-podcast.md
deleted file mode 100644
index e9c74761d..000000000
--- a/docs/my-podcast.md
+++ /dev/null
@@ -1 +0,0 @@
-**TBD**
diff --git a/docs/preparing-the-server.md b/docs/preparing-the-server.md
index e433d38e8..9fc22bfdf 100644
--- a/docs/preparing-the-server.md
+++ b/docs/preparing-the-server.md
@@ -1,3 +1,7 @@
+---
+layout: docs
+---
+
 # Preparing the Server
 
 The following instructions assume that you have root access (**sudo** on most
diff --git a/docs/promoting-your-station.md b/docs/promoting-your-station.md
index 4e7718886..2b86b68f7 100644
--- a/docs/promoting-your-station.md
+++ b/docs/promoting-your-station.md
@@ -1,3 +1,8 @@
+---
+layout: docs
+title: Promoting Your Station
+---
+
 Promoting Your Station
 ----------------------
 
diff --git a/docs/quickstart.md b/docs/quickstart.md
index 3435abc0b..98e70d73f 100644
--- a/docs/quickstart.md
+++ b/docs/quickstart.md
@@ -16,7 +16,7 @@ these are less tested. Firewall and static IP address configuration will need to
 |---------------------|---------------|
 | 1 Ghz Processor| 1vCPU |
 | 2 GB RAM | 2 GB RAM |
-| Wired ethernet connection and a static IP address (see below for instructions) | 2 TB of data transfer/month |
+| Wired ethernet connection, static IP address | 2 TB of data transfer/month |
 
 [DigitalOcean](https://www.digitalocean.com/pricing/#Compute) and [Linode](https://www.linode.com/pricing/#row--compute)
  have similar plans that meet Cloud Install requirements. Both plans cost $10/month.
diff --git a/docs/setting-the-server-time.md b/docs/setting-the-server-time.md
index 294ea3b7b..8f9f0f2ea 100644
--- a/docs/setting-the-server-time.md
+++ b/docs/setting-the-server-time.md
@@ -1,5 +1,6 @@
 ---
-sidebar: installer
+layout: docs
+title: Setting the Server Time
 ---
 
 # Setting the server time
diff --git a/docs/ssl-config.md b/docs/ssl-config.md
index c0ace04b4..db257e901 100644
--- a/docs/ssl-config.md
+++ b/docs/ssl-config.md
@@ -1,5 +1,6 @@
 ---
-sidebar: installer
+layout: docs
+title: Setting up SSL
 ---
 
 # Setting up SSL
diff --git a/docs/track-types.md b/docs/track-types.md
index f2e5b311c..ff63aa850 100644
--- a/docs/track-types.md
+++ b/docs/track-types.md
@@ -1,3 +1,7 @@
+---
+layout: docs
+---
+
 Working with track types
 ------------------------