diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..73f69e0
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..d918d71
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/website-new.iml" filepath="$PROJECT_DIR$/.idea/website-new.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/website-new.iml b/.idea/website-new.iml
new file mode 100644
index 0000000..5e764c4
--- /dev/null
+++ b/.idea/website-new.iml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="Go" enabled="true" />
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/content/download.html b/content/download.html
deleted file mode 100644
index a85b983..0000000
--- a/content/download.html
+++ /dev/null
@@ -1,8 +0,0 @@
----
-title: "Get Cwtch"
-date: 2020-12-10T14:07:19-08:00
-draft: false
----
-
-We are preparing for a Beta release very soon!
-
diff --git a/content/download.md b/content/download.md
new file mode 100644
index 0000000..d47928e
--- /dev/null
+++ b/content/download.md
@@ -0,0 +1,25 @@
+---
+title: "Get Cwtch"
+date: 2020-12-10T14:07:19-08:00
+draft: false
+---
+
+We are preparing for a Beta release very soon!
+
+
+# Android
+
+* APK: 
+
+# Windows
+
+* EXE:
+
+# Linux
+
+* amd64: 
+
+# Build from Source
+
+* libcwtch-go: https://git.openprivacy.ca/flutter/libcwtch-go
+* Flutter UI:  https://git.openprivacy.ca/flutter/flutter_app
diff --git a/static/favicon.png b/static/favicon.png
index 26a2bd5..df58306 100644
Binary files a/static/favicon.png and b/static/favicon.png differ
diff --git a/static/images/cwtch.png b/static/images/cwtch.png
new file mode 100644
index 0000000..df58306
Binary files /dev/null and b/static/images/cwtch.png differ
diff --git a/themes/cwtch/layouts/index.html b/themes/cwtch/layouts/index.html
index 2e43be4..9f84a15 100644
--- a/themes/cwtch/layouts/index.html
+++ b/themes/cwtch/layouts/index.html
@@ -11,12 +11,30 @@
         <img src="images/CWTCH_WEB/cwtch%20phones.png" width="90%">
       </div>
     </div>
-  <hr id="how-it-works"  />
+
+      <h2>What is Cwtch?</h2>
+
+      <p>Cwtch (a Welsh word roughly translating to “a hug that creates a safe place”) is a decentralized, privacy-preserving,
+      multi-party messaging protocol that can be used to build metadata resistant applications.</p>
+
+
+      <ul>
+        <li><strong>Decentralized and Open</strong>: There is no “Cwtch service” or “Cwtch network”.
+      Participants in Cwtch can host their own safe spaces, or lend their infrastructure to others
+      seeking a safe space.  The Cwtch protocol is open, and anyone is free to build bots, services and user interfaces
+          and integrate and interact with Cwtch.</li>
+       <li><strong>Privacy Preserving</strong>: All communication in Cwtch is end-to-end encrypted and takes place over Tor v3 onion services.</li>
+        <li><strong>Metadata Resistant</strong>: Cwtch has been designed such that no information is exchanged or available to anyone without their explicit consent, including on-the-wire messages and protocol metadata.</li>
+      </ul>
+
+      <hr id="how-it-works"  />
 
       <div  class="row text-center  justify-content-around  align-items-center">
         <div class="col-md-6">
-        <h2>Coming Soon</h2>
-
+          <h2>How it Works</h2>
+          <video width="99%" controls>
+            <source src="/cwtch-explainer.mp4" type="video/mp4">
+          </video>
         </div>
       </div>
   <hr/>
@@ -115,5 +133,24 @@
       </div>
 
       <hr/>
+
+      <h2>FAQ</h2>
+
+      <h3>What is the difference between a peer-to-peer connection and a cwtch group?</h3>
+
+      <p>Cwtch peer-to-peer connections allow 2 people to message each other directly. Behind the scenes peer-to-peer connections
+      use Tor v3 onion services to provide an encrypted, and metadata resistant connection. Because of this direct connection, both parties need
+      to be online at the same time in order to message each other.</p>
+
+      <p>Cwtch Groups allow multiple parties to participate in a single conversation using an untrusted server (that cna be provided by 3rd party or
+      self hosted). Server operators cannot learn how many people are in a group, or what is being discussed. If multiple groups are hosted on a
+      single server then the server is unable to learn which messages belong to which group without the collusion of a group member. Unlike in peer-to-peer
+      conversations, group conversations can be conducted asynchronously, so everyone in a group doesn't need to be online at the same time.</p>
+
+      <h3>What happens if I forget the password to an encrypted profile?</h3>
+
+      <p>Without the password it is practically impossible for anyone to derive the key to decrypt the profile. As such that profile should be considered
+      lost.</p>
+
     </div>
     {{ partial "footer.html" . }}
\ No newline at end of file
diff --git a/themes/cwtch/layouts/partials/footer.html b/themes/cwtch/layouts/partials/footer.html
index 0a63da5..ecf5189 100644
--- a/themes/cwtch/layouts/partials/footer.html
+++ b/themes/cwtch/layouts/partials/footer.html
@@ -1,10 +1,8 @@
 </div>
-<footer>
+<footer  class = "text-center">
+
     <div class="row">
-        <div class="col-3 col-md align-content-center text-center">
-            <a href="https://openprivacy.ca"><img src="/images/Open_Privacy_Logo_lightoutline.png" alt="Made by Open Privacy Research Society"/></a>
-        </div>
-        <div class="col-3 col-md">
+        <div class="col-4 col-md">
             <h5>Research</h5>
             <ul class="list-unstyled text-small">
                 <li><a href="https://docs.openprivacy.ca/cwtch-security-handbook/">Security Handbook</a></li>
@@ -12,18 +10,23 @@
             </ul>
         </div>
 
-        <div class="col-3 col-md">
+        <div class="col-4 col-md">
             <h5>Developers</h5>
             <ul class="list-unstyled text-small">
-                <li><a href="https://git.openprivacy.ca/cwtch.im/ui">Code</a></li>
-                <li><a href="https://git.openprivacy.ca/cwtch.im/ui/issues">Issues</a></li>
+                <li><a href="https://git.openprivacy.ca/cwtch.im/">Code</a></li>
+                <li><a href="https://git.openprivacy.ca/cwtch.im/ui/issues">Report an Issue</a></li>
             </ul>
         </div>
-        <div class="col-2 col-md">
+        <div class="col-4 col-md">
             <h5><a href="https://openprivacy.ca/donate">Donate</a></h5>
             <h5><a href="/privacy-policy">Privacy Policy</a></h5>
         </div>
     </div>
+    <div class = "text-center row">
+        <div class="col-12 col-md align-content-center text-center">
+            <a href="https://openprivacy.ca"><img src="/images/Open_Privacy_Logo_lightoutline.png" alt="Made by Open Privacy Research Society"/></a>
+        </div>
+    </div>
 </footer>
 </body>
 <script src="/js/jquery-3.5.1.min.js"></script>
diff --git a/themes/cwtch/layouts/partials/header.html b/themes/cwtch/layouts/partials/header.html
index 4204c81..c0bcf3c 100644
--- a/themes/cwtch/layouts/partials/header.html
+++ b/themes/cwtch/layouts/partials/header.html
@@ -21,14 +21,16 @@
 
 <body>
 
-<nav class="site-header sticky-top py-1">
-    <div class="container d-flex flex-column flex-md-row justify-content-between">
-        <a class="py-2" href="/">
+<nav class="text-center">
+    <div class="container">
+        <ul>
+        <li><a href="/">
             <img src="/images/500x500_white.png" height="100px">
-        </a>
-        <a class="py-2 d-none d-md-inline-block" href="/#how-it-works">HOW IT WORKS</a>
-        <a class="py-2 d-none d-md-inline-block" href="https://git.openprivacy.ca/cwtch.im/ui">CODE</a>
-        <a class="py-2 d-none d-md-inline-block" href="/download">GET CWTCH</a>
+        </a></li>
+            <li><a  href="/#how-it-works">HOW IT WORKS</a></li>
+            <li><a href="https://git.openprivacy.ca/cwtch.im">CODE</a></li>
+        <li><a  href="/download">GET CWTCH</a></li>
+        </ul>
     </div>
 </nav>
 
diff --git a/themes/cwtch/static/css/style.css b/themes/cwtch/static/css/style.css
index 6344511..500bb71 100644
--- a/themes/cwtch/static/css/style.css
+++ b/themes/cwtch/static/css/style.css
@@ -1,12 +1,17 @@
+body {
+  padding-top: 1%;
+}
+
 .container {
-  max-width: 960px;
+  padding-left: 5%;
+  padding-right:5%;
 }
 
 /*
  * Custom translucent site header
  */
 
-.site-header {
+nav {
   background-color: #281831;
   -webkit-backdrop-filter: saturate(180%) blur(20px);
   backdrop-filter: saturate(180%) blur(20px);
@@ -22,12 +27,20 @@
   text-decoration: none;
 }
 
+nav li {
+  list-style: none none;
+}
+
 hr {
   color: #281831;
   border-top: 0px;
   margin-bottom:5px;
 }
 
+h2 {
+  text-align: center;
+}
+
 @font-face {
   src: url("/fonts/OpenSans-Light.ttf") format("truetype");
   font-family: "OpenSans Light";
@@ -54,6 +67,10 @@ hr {
   font-family: "Atami Regular";
 }
 
+.container {
+  margin-top:0px;
+}
+
 body {
   background-color: #281831;
   color:#fff;
@@ -112,6 +129,7 @@ footer {
   margin:0px;
   width:100%;
   font-size:0.8em;
+
 }
 
 footer h5 {