diff --git a/forksand_website/static/src/img/carousel/IMG_20180117_222633.jpg b/forksand_website/static/src/img/media/IMG_20180117_222633.jpg
similarity index 100%
rename from forksand_website/static/src/img/carousel/IMG_20180117_222633.jpg
rename to forksand_website/static/src/img/media/IMG_20180117_222633.jpg
diff --git a/forksand_website/static/src/img/showcase/IMG_20180117_231522.jpg b/forksand_website/static/src/img/media/IMG_20180117_231522.jpg
similarity index 100%
rename from forksand_website/static/src/img/showcase/IMG_20180117_231522.jpg
rename to forksand_website/static/src/img/media/IMG_20180117_231522.jpg
diff --git a/forksand_website/static/src/img/showcase/IMG_20180118_182121.jpg b/forksand_website/static/src/img/media/IMG_20180118_182121.jpg
similarity index 100%
rename from forksand_website/static/src/img/showcase/IMG_20180118_182121.jpg
rename to forksand_website/static/src/img/media/IMG_20180118_182121.jpg
diff --git a/forksand_website/static/src/img/carousel/IMG_20180118_182153.jpg b/forksand_website/static/src/img/media/IMG_20180118_182153.jpg
similarity index 100%
rename from forksand_website/static/src/img/carousel/IMG_20180118_182153.jpg
rename to forksand_website/static/src/img/media/IMG_20180118_182153.jpg
diff --git a/forksand_website/static/src/img/showcase/IMG_20180118_190156.jpg b/forksand_website/static/src/img/media/IMG_20180118_190156.jpg
similarity index 100%
rename from forksand_website/static/src/img/showcase/IMG_20180118_190156.jpg
rename to forksand_website/static/src/img/media/IMG_20180118_190156.jpg
diff --git a/forksand_website/static/src/img/carousel/forksand-hifive-case.png b/forksand_website/static/src/img/media/forksand-hifive-case.png
similarity index 100%
rename from forksand_website/static/src/img/carousel/forksand-hifive-case.png
rename to forksand_website/static/src/img/media/forksand-hifive-case.png
diff --git a/forksand_website/static/src/img/showcase/freecadhifi.png b/forksand_website/static/src/img/media/freecadhifi.png
similarity index 100%
rename from forksand_website/static/src/img/showcase/freecadhifi.png
rename to forksand_website/static/src/img/media/freecadhifi.png
diff --git a/forksand_website/static/src/img/showcase/IMG_20180118_182153.jpg b/forksand_website/static/src/img/showcase/IMG_20180118_182153.jpg
deleted file mode 100644
index 37a51ae..0000000
Binary files a/forksand_website/static/src/img/showcase/IMG_20180118_182153.jpg and /dev/null differ
diff --git a/forksand_website/static/src/img/showcase/forksand-hifive-case.png b/forksand_website/static/src/img/showcase/forksand-hifive-case.png
deleted file mode 100644
index 489b682..0000000
Binary files a/forksand_website/static/src/img/showcase/forksand-hifive-case.png and /dev/null differ
diff --git a/forksand_website/views/header_view.xml b/forksand_website/views/header_view.xml
index 5383f8c..5ce5e12 100644
--- a/forksand_website/views/header_view.xml
+++ b/forksand_website/views/header_view.xml
@@ -1,19 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <odoo>
 
-    <!-- Customize header  -->
     <template id="custom_wrapwrap" inherit_id="website.layout"
               name="Custom Header">
-
-        <!--<xpath expr="//div[@id='wrapwrap']/header/div" position="attributes">-->
-            <!--<attribute name="class">navbar navbar-default navbar-fixed-top-->
-            <!--</attribute>-->
-        <!--</xpath>-->
-
         <xpath expr="//div[@id='wrapwrap']/header" position="attributes">
             <attribute name="class">alternate-font</attribute>
         </xpath>
-
     </template>
 
     <template id="custom_wrap" inherit_id="website.homepage"
diff --git a/forksand_website/views/home_view.xml b/forksand_website/views/home_view.xml
index df9cc16..b84ff29 100644
--- a/forksand_website/views/home_view.xml
+++ b/forksand_website/views/home_view.xml
@@ -25,37 +25,25 @@
             <div id="wrap" class="oe_structure oe_empty">
                 <t t-call="forksand_website.init_header"/>
                 <t t-call="forksand_website.about"/>
-                <t t-call="forksand_website.showcase"/>
+                <t t-call="forksand_website.media"/>
                 <t t-call="forksand_website.contact"/>
             </div>
         </t>
     </template>
 
 
-    <template id="forksand_website.init_header" name="Home Carrousel">
+    <template id="forksand_website.init_header" name="Initial Header">
         <div class="bg-primary text-white" id="intro">
             <div class="img-fluid container text-center">
                 <img alt=""
-                     src="forksand_website/static/src/img/logoVertical.png"
-                     data-sr-id="2"
-                     style="; visibility: visible;  -webkit-transform: translateY(0) scale(1); opacity: 1;transform: translateY(0) scale(1); opacity: 1;-webkit-transition: -webkit-transform 0.6s cubic-bezier(0.6, 0.2, 0.1, 1) 0s, opacity 0.6s cubic-bezier(0.6, 0.2, 0.1, 1) 0s; transition: transform 0.6s cubic-bezier(0.6, 0.2, 0.1, 1) 0s, opacity 0.6s cubic-bezier(0.6, 0.2, 0.1, 1) 0s; "/>
-
-                <p class="lead" data-sr-id="5"
-                   style="; visibility: visible;  -webkit-transform: translateY(0) scale(1); opacity: 1;transform: translateY(0) scale(1); opacity: 1;-webkit-transition: -webkit-transform 0.6s cubic-bezier(0.6, 0.2, 0.1, 1) 0.2s, opacity 0.6s cubic-bezier(0.6, 0.2, 0.1, 1) 0.2s; transition: transform 0.6s cubic-bezier(0.6, 0.2, 0.1, 1) 0.2s, opacity 0.6s cubic-bezier(0.6, 0.2, 0.1, 1) 0.2s; ">
-                    Free Software &amp; Open Source Hardware
-                </p>
+                     src="forksand_website/static/src/img/logoVertical.png"/>
 
+                <p class="lead">Free Software &amp; Open Source Hardware</p>
                 <div class="mx-auto">
                     <a class="btn btn-light btnRoundded buttonMargin sr-button js-scroll-trigger"
-                       href="#media" data-sr-id="14"
-                       style="visibility: visible; transform: translateY(0px) scale(1); opacity: 1; transition: color 0.15s ease-in-out 0s, background-color 0.15s ease-in-out 0s, border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s, transform 1s cubic-bezier(0.6, 0.2, 0.1, 1) 0.6s, opacity 1s cubic-bezier(0.6, 0.2, 0.1, 1) 0.6s;">
-                        Free Software
-                    </a>
+                       href="#media">Free Software</a>
                     <a class="btn btn-light btnRoundded buttonMargin sr-button js-scroll-trigger"
-                       href="#media" data-sr-id="15"
-                       style="visibility: visible; transform: translateY(0px) scale(1); opacity: 1; transition: color 0.15s ease-in-out 0s, background-color 0.15s ease-in-out 0s, border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s, transform 1s cubic-bezier(0.6, 0.2, 0.1, 1) 0.6s, opacity 1s cubic-bezier(0.6, 0.2, 0.1, 1) 0.6s;">
-                        Open Source Hardware
-                    </a>
+                       href="#media">Open Source Hardware</a>
                 </div>
             </div>
         </div>
@@ -83,83 +71,70 @@
                     </div>
                 </div>
             </div>
-            <section id="media">
-                <div class="container-fluid showcase-left">
-                    <div class="title text-center">
-                        <h1 class="Brown">Media</h1>
-                    </div>
-
-                    <div class="container">
-                        <div class="carousel slide" data-ride="carousel"
-                             id="demo">
-                            <ul class="carousel-indicators">
-                                <li class="active" data-slide-to="0"
-                                    data-target="#demo"></li>
-                                <li data-slide-to="1" data-target="#demo"></li>
-                                <li data-slide-to="2" data-target="#demo"></li>
-                            </ul>
+        </div>
+    </template>
 
-                            <div class="carousel-inner">
-                                <div class="carousel-item active">
-                                    <img alt="Los Angeles"
-                                         class="img-fluid img-thumbnail"
-                                         height="300"
-                                         src="forksand_website/static/src/img/carousel/forksand-hifive-case.png"
-                                         width="1100"/>
-                                </div>
+    <template id="forksand_website.media" name="Media Content">
+        <section class="showcase-left" id="media">
+            <div class="container">
+                <div class="title text-center">
+                    <h1 class="Brown">Media</h1>
+                </div>
+                <div class="tz-gallery">
+                     <div class="row">
+                        <div class="col-md-4">
+                            <a class="lightbox"
+                               href="forksand_website/static/src/img/media/forksand-hifive-case.png">
+                                <img alt="Bridge"
+                                     class="img-fluid img-thumbnail img2"
+                                     src="forksand_website/static/src/img/media/forksand-hifive-case.png"/>
+                            </a>
+                        </div>
 
-                                <div class="carousel-item">
-                                    <img alt="Chicago"
-                                         class="img-fluid img-thumbnail"
-                                         height="300"
-                                         src="forksand_website/static/src/img/carousel/IMG_20180118_182153.jpg"
-                                         width="1100"/>
-                                </div>
+                        <div class="col-md-4">
+                            <a class="lightbox"
+                               href="forksand_website/static/src/img/media/IMG_20180118_182153.jpg">
+                                <img alt="Bridge"
+                                     class="img-fluid img-thumbnail img2"
+                                     src="forksand_website/static/src/img/media/IMG_20180118_182153.jpg"/>
+                            </a>
+                        </div>
 
-                                <div class="carousel-item">
-                                    <img alt="New York"
-                                         class="img-fluid img-thumbnail"
-                                         height="300"
-                                         src="forksand_website/static/src/img/carousel/IMG_20180117_222633.jpg"
-                                         width="1100"/>
-                                </div>
-                            </div>
+                        <div class="col-md-4">
+                            <a class="lightbox"
+                               href="forksand_website/static/src/img/media/IMG_20180117_222633.jpg">
+                                <img alt="Bridge"
+                                     class="img-fluid img-thumbnail img2"
+                                     src="forksand_website/static/src/img/media/IMG_20180117_222633.jpg"/>
+                            </a>
                         </div>
                     </div>
-                </div>
-            </section>
-        </div>
-    </template>
 
-    <template id="forksand_website.showcase" name="Newsletter Modal">
-        <section class="showcase-left">
-            <div class="container">
-                <div class="tz-gallery">
                     <div class="row">
                         <div class="col-md-4">
                             <a class="lightbox"
-                               href="forksand_website/static/src/img/showcase/freecadhifi.png">
+                               href="forksand_website/static/src/img/media/freecadhifi.png">
                                 <img alt="Bridge"
                                      class="img-fluid img-thumbnail img2"
-                                     src="forksand_website/static/src/img/showcase/freecadhifi.png"/>
+                                     src="forksand_website/static/src/img/media/freecadhifi.png"/>
                             </a>
                         </div>
 
                         <div class="col-md-4">
                             <a class="lightbox"
-                               href="forksand_website/static/src/img/showcase/IMG_20180117_231522.jpg">
+                               href="forksand_website/static/src/img/media/IMG_20180117_231522.jpg">
                                 <img alt="Bridge"
                                      class="img-fluid img-thumbnail img2"
-                                     src="forksand_website/static/src/img/showcase/IMG_20180117_231522.jpg"/>
+                                     src="forksand_website/static/src/img/media/IMG_20180117_231522.jpg"/>
                             </a>
                         </div>
 
                         <div class="col-md-4">
                             <a class="lightbox"
-                               href="forksand_website/static/src/img/showcase/forksand-hifive-case.png">
+                               href="forksand_website/static/src/img/media/forksand-hifive-case.png">
                                 <img alt="Bridge"
                                      class="img-fluid img-thumbnail img2"
-                                     src="forksand_website/static/src/img/showcase/forksand-hifive-case.png"/>
+                                     src="forksand_website/static/src/img/media/forksand-hifive-case.png"/>
                             </a>
                         </div>
                     </div>
@@ -167,28 +142,28 @@
                     <div class="row">
                         <div class="col-md-4">
                             <a class="lightbox"
-                               href="forksand_website/static/src/img/showcase/IMG_20180118_182121.jpg">
+                               href="forksand_website/static/src/img/media/IMG_20180118_182121.jpg">
                                 <img alt="Bridge"
                                      class="img-fluid img-thumbnail img2"
-                                     src="forksand_website/static/src/img/showcase/IMG_20180118_182121.jpg"/>
+                                     src="forksand_website/static/src/img/media/IMG_20180118_182121.jpg"/>
                             </a>
                         </div>
 
                         <div class="col-md-4">
                             <a class="lightbox"
-                               href="forksand_website/static/src/img/showcase/IMG_20180118_182153.jpg">
+                               href="forksand_website/static/src/img/media/IMG_20180118_182153.jpg">
                                 <img alt="Bridge"
                                      class="img-fluid img-thumbnail img2"
-                                     src="forksand_website/static/src/img/showcase/IMG_20180118_182153.jpg"/>
+                                     src="forksand_website/static/src/img/media/IMG_20180118_182153.jpg"/>
                             </a>
                         </div>
 
                         <div class="col-md-4">
                             <a class="lightbox"
-                               href="forksand_website/static/src/img/showcase/IMG_20180118_190156.jpg">
+                               href="forksand_website/static/src/img/media/IMG_20180118_190156.jpg">
                                 <img alt="Bridge"
                                      class="img-fluid img-thumbnail img2"
-                                     src="forksand_website/static/src/img/showcase/IMG_20180118_190156.jpg"/>
+                                     src="forksand_website/static/src/img/media/IMG_20180118_190156.jpg"/>
                             </a>
                         </div>
                     </div>
@@ -207,7 +182,9 @@
 
     <template id="forksand_website.contact" name="Contact Forksand">
         <div class="container">
-            <h1 class="Brown">Contact</h1>
+            <div class="title text-center">
+                    <h1 class="Brown">Contact</h1>
+                </div>
             <div class="row">
                 <div class="col-md-8">
                     <div class="text-center mt64" name="mail_button">