diff --git a/forksand_website/__manifest__.py b/forksand_website/__manifest__.py
index 8112625..cc7c7da 100644
--- a/forksand_website/__manifest__.py
+++ b/forksand_website/__manifest__.py
@@ -12,12 +12,21 @@
     'category': 'Uncategorized',
     'version': '0.1',
     'depends': ['theme_default', 'website',
-                'website_anchor_smooth_scroll', 'website_crm',
-                'website_cookie_notice', 'website_js_below_the_fold',
-                'website_odoo_debranding'
+                'website_anchor_smooth_scroll',
+                'website_crm',
+                'website_js_below_the_fold',
+                'website_odoo_debranding',
+                'cms_mrp_bom_form',
+                'cms_product_form',
                 ],
     'data': [
-        'views/home_view.xml',
-        'views/header_view.xml',
+        'views/assets.xml',
+        'views/homepage.xml',
+        'views/home/init_header.xml',
+        'views/home/about.xml',
+        'views/home/media.xml',
+        'views/home/contact.xml',
+        'views/nav_menu_entries.xml',
+        'views/footer.xml',
     ],
 }
\ No newline at end of file
diff --git a/forksand_website/static/src/css/scrolling-nav.css b/forksand_website/static/src/css/scrolling-nav.css
index 498bb8c..1e30bd5 100644
--- a/forksand_website/static/src/css/scrolling-nav.css
+++ b/forksand_website/static/src/css/scrolling-nav.css
@@ -399,4 +399,9 @@ a{
     color: #212529;
     background-color: #f8f9fa;
     border-color: #f8f9fa;
+}
+
+footer a {
+color: #fff;
+text-decoration: underline;
 }
\ No newline at end of file
diff --git a/forksand_website/static/src/img/favicon.ico b/forksand_website/static/src/img/favicon.ico
new file mode 100644
index 0000000..da01201
Binary files /dev/null and b/forksand_website/static/src/img/favicon.ico differ
diff --git a/forksand_website/static/src/img/logo-active.png b/forksand_website/static/src/img/logo-active.png
new file mode 100644
index 0000000..523ac42
Binary files /dev/null and b/forksand_website/static/src/img/logo-active.png differ
diff --git a/forksand_website/views/assets.xml b/forksand_website/views/assets.xml
new file mode 100644
index 0000000..b74abb6
--- /dev/null
+++ b/forksand_website/views/assets.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!--HEADER CSS and JS import-->
+    <template id="assets_frontend" name="Custom styles"
+              inherit_id="web.assets_frontend">
+        <xpath expr="." position="inside">
+            <link rel='stylesheet'
+                  href='/forksand_website/static/src/css/scrolling-nav.css'/>
+            <link rel='stylesheet'
+                  href='/forksand_website/static/src/css/baguetteBox.min.css'/>
+            <script type="text/javascript"
+                    src="/forksand_website/static/src/js/scrolling-nav.js"></script>
+            <script type="text/javascript"
+                    src="/forksand_website/static/src/js/baguetteBox.min.js"></script>
+            <script>
+                baguetteBox.run('.tz-gallery');
+            </script>
+        </xpath>
+    </template>
+
+    <!--Inject fonts on layout-->
+    <template id="font_wrapwrap" inherit_id="website.layout"
+              name="Custom Header">
+        <xpath expr="//div[@id='wrapwrap']/header" position="attributes">
+            <attribute name="class">alternate-font</attribute>
+        </xpath>
+    </template>
+
+    <template id="font_wrap" inherit_id="website.homepage"
+              name="Custom Body">
+        <xpath expr="//div[@id='wrap']" position="attributes">
+            <attribute name="class">alternate-font</attribute>
+        </xpath>
+    </template>
+
+    <template id="font_footer" inherit_id="footer_forksand"
+              name="Automatic Footer">
+         <xpath expr="//div[@id='footer']" position="attributes">
+            <attribute name="class">alternate-font container hidden-print</attribute>
+        </xpath>
+        <xpath expr="//footer" position="attributes">
+            <attribute name="class">bg-primary text-white</attribute>
+        </xpath>
+        <xpath expr="//a" position="attributes">
+            <attribute name="class">bg-primary text-white</attribute>
+        </xpath>
+    </template>
+
+    <!--Substitute googlemaps for openstreetmap-->
+    <template id="layout" inherit_id="website.company_description">
+        <xpath expr="//address/t[@t-if='not res_company.google_map_img()']" position="replace">
+            <t/>
+        </xpath>
+
+        <xpath expr="//t[@t-if='res_company.google_map_img()']" position="replace">
+            <t>
+                <iframe class="img-fluid"
+                        width="425"
+                        height="350"
+                        frameborder="0"
+                        scrolling="no"
+                        marginheight="0"
+                        marginwidth="0"
+                        src="https://www.openstreetmap.org/export/embed.html?bbox=-105.08792191743854%2C40.45830934706369%2C-105.08595049381258%2C40.46016648098172&amp;layer=mapnik"
+                        style="border: 1px solid black">
+
+                </iframe><br/><small><a href="https://www.openstreetmap.org/#map=19/40.45924/-105.08694&amp;layers=ND" target="_blank">View Larger Map</a></small>
+            </t>
+        </xpath>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/forksand_website/views/footer.xml b/forksand_website/views/footer.xml
new file mode 100644
index 0000000..b1adc2a
--- /dev/null
+++ b/forksand_website/views/footer.xml
@@ -0,0 +1,55 @@
+<odoo>
+<template id="footer_forksand" inherit_id="website.footer_default" name="Automatic Footer">
+    <xpath expr="//div[@id='footer']" position="replace" >
+        <div id="footer" class="container hidden-print" t-if='not no_footer'>
+            <div class="row">
+                <div class="col-md-4 col-lg-3">
+                    <h4>Summary</h4>
+                    <ul class="list-unstyled" id="products">
+                        <li><a href="/">Home</a></li>
+                        <li><a href="/products">Search products</a></li>
+                        <li><a href="/mrp_boms">Search by Bill of Materials</a></li>
+                        <li><a href="/shop">Shop</a></li>
+                    </ul>
+                </div>
+                <div class="col-md-4  col-lg-3" id="info">
+                    <h4>Connect with us</h4>
+                    <ul class="list-unstyled">
+                        <li><a href="/contactus">Contact us</a></li>
+                    </ul>
+                    <ul class="list-unstyled">
+                        <li t-ignore="true"><i class="fa fa-phone"></i> <span t-field="res_company.phone"></span></li>
+                        <li t-ignore="true"><i class="fa fa-envelope"></i>  <span t-field="res_company.email"></span></li>
+                    </ul>
+                    <h2>
+                        <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
+                        <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>
+                        <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>
+                        <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>
+                        <a t-att-href="website.social_googleplus" t-if="website.social_googleplus" rel="publisher"><i class="fa fa-google-plus-square"/></a>
+                        <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>
+                    </h2>
+                </div>
+                <div class="col-md-4 col-lg-5 col-lg-offset-1">
+                    <h4>
+                        <span t-field="res_company.name" />
+                        <small> - <a href="/aboutus">About us</a></small>
+                    </h4>
+                    <div>
+                        <p>
+                            We are a team of passionate people whose goal is to improve everyone's
+                            life through disruptive products. We build great products to solve your
+                            business problems.
+                        </p>
+                        <p>
+                            Our products are designed for small to medium size companies willing to optimize
+                            their performance.
+                        </p>
+                    </div>
+                    <t t-call="website.language_selector"/>
+                </div>
+            </div>
+        </div>
+    </xpath>
+</template>
+</odoo>
\ No newline at end of file
diff --git a/forksand_website/views/header_view.xml b/forksand_website/views/header_view.xml
deleted file mode 100644
index 5ce5e12..0000000
--- a/forksand_website/views/header_view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-
-    <template id="custom_wrapwrap" inherit_id="website.layout"
-              name="Custom Header">
-        <xpath expr="//div[@id='wrapwrap']/header" position="attributes">
-            <attribute name="class">alternate-font</attribute>
-        </xpath>
-    </template>
-
-    <template id="custom_wrap" inherit_id="website.homepage"
-              name="Custom Body">
-        <xpath expr="//div[@id='wrap']" position="attributes">
-            <attribute name="class">alternate-font</attribute>
-        </xpath>
-    </template>
-
-</odoo>
\ No newline at end of file
diff --git a/forksand_website/views/home/about.xml b/forksand_website/views/home/about.xml
new file mode 100644
index 0000000..b81c3bb
--- /dev/null
+++ b/forksand_website/views/home/about.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template id="forksand_website.about" name="About">
+        <div class="section1" id="about">
+            <div class="case-study showcase-bottom">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-md-12">
+                            <div class="title text-center">
+
+                                <h1 class="Brown">About Us</h1>
+
+                                <div class="myHeading">Fork Sand, Inc. is a free
+                                    Software, Open Source
+                                    <br/>
+                                    Hardware company developing Secure computing
+                                    <br/>
+                                    devices that guard users&#39; privacy.
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/forksand_website/views/home/contact.xml b/forksand_website/views/home/contact.xml
new file mode 100644
index 0000000..770f5a6
--- /dev/null
+++ b/forksand_website/views/home/contact.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template id="forksand_website.contact" name="Contact Forksand">
+        <div class="container">
+            <div class="title text-center">
+                    <h1 class="Brown">Contact</h1>
+                </div>
+            <div class="row">
+                <div class="col-md-6">
+                    <div class="text-center mt64" name="mail_button">
+                        <form action="/website_form/" method="post" data-model_name="crm.lead" data-success_page="/contactus-thank-you" class="s_website_form form-horizontal container-fluid mt32" enctype="multipart/form-data" data-editable-form="false">
+                        <div class="form-group form-field o_website_form_required_custom">
+                            <label class="col-md-3 col-sm-4 control-label" for="contact_name">Your Name</label>
+                            <div class="col-md-7 col-sm-8">
+                                <input type="text" class="form-control o_website_form_input" name="contact_name" t-att-value="request.params.get('contact_name', '')" required=""/>
+                            </div>
+                        </div>
+                        <div class="form-group form-field">
+                            <label class="col-md-3 col-sm-4 control-label" for="phone">Phone Number</label>
+                            <div class="col-md-7 col-sm-8">
+                                <input type="text" class="form-control o_website_form_input" name="phone" t-att-value="request.params.get('phone', '')"/>
+                            </div>
+                        </div>
+                        <div class="form-group form-field o_website_form_required_custom">
+                            <label class="col-md-3 col-sm-4 control-label" for="email_from">Email</label>
+                            <div class="col-md-7 col-sm-8">
+                                <input type="text" class="form-control o_website_form_input" name="email_from" required="" t-att-value="request.params.get('email_from', '')"/>
+                            </div>
+                        </div>
+                        <div class="form-group form-field o_website_form_required_custom">
+                            <label class="col-md-3 col-sm-4 control-label" for="partner_name">Your Company</label>
+                            <div class="col-md-7 col-sm-8">
+                                <input type="text" class="form-control o_website_form_input" name="partner_name" required="" t-att-value="request.params.get('partner_name', '')"/>
+                            </div>
+                        </div>
+                        <div class="form-group form-field o_website_form_required">
+                            <label class="col-md-3 col-sm-4 control-label" for="name">Subject</label>
+                            <div class="col-md-7 col-sm-8">
+                                <input type="text" class="form-control o_website_form_input" name="name" required="" t-att-value="request.params.get('name', '')"/>
+                            </div>
+                        </div>
+                        <div class="form-group form-field o_website_form_required_custom">
+                            <label class="col-md-3 col-sm-4 control-label" for="description">Your Question</label>
+                            <div class="col-md-7 col-sm-8">
+                                <textarea class="form-control o_website_form_input" name="description" required=""><t t-esc="request.params.get('description', '')"/></textarea>
+                            </div>
+                        </div>
+                        <div class="form-group">
+                            <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
+                                <span class="btn btn-primary btn-lg o_website_form_send">Send</span>
+                                <span id="o_website_form_result"/>
+                            </div>
+                        </div>
+                    </form>
+                    </div>
+                </div>
+                <div class="col-md-6 mb32">
+                    <img class="img-responsive" src="forksand_website/static/src/img/BC.png"/>
+                </div>
+            </div>
+        </div>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/forksand_website/views/home/init_header.xml b/forksand_website/views/home/init_header.xml
new file mode 100644
index 0000000..ecdfd36
--- /dev/null
+++ b/forksand_website/views/home/init_header.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <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"/>
+
+                <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">Free Software</a>
+                    <a class="btn btn-light btnRoundded buttonMargin sr-button js-scroll-trigger"
+                       href="#media">Open Source Hardware</a>
+                </div>
+            </div>
+        </div>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/forksand_website/views/home/media.xml b/forksand_website/views/home/media.xml
new file mode 100644
index 0000000..1c7a0f7
--- /dev/null
+++ b/forksand_website/views/home/media.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+<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="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="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 class="row">
+                        <div class="col-md-4">
+                            <a class="lightbox"
+                               href="forksand_website/static/src/img/media/freecadhifi.png">
+                                <img alt="Bridge"
+                                     class="img-fluid img-thumbnail img2"
+                                     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/media/IMG_20180117_231522.jpg">
+                                <img alt="Bridge"
+                                     class="img-fluid img-thumbnail img2"
+                                     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/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>
+
+                    <div class="row">
+                        <div class="col-md-4">
+                            <a class="lightbox"
+                               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/media/IMG_20180118_182121.jpg"/>
+                            </a>
+                        </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="col-md-4">
+                            <a class="lightbox"
+                               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/media/IMG_20180118_190156.jpg"/>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </section>
+
+        <section class="section showcase-bottom">
+            <div class="card col-md-12 container bg-primary text-white text-center p-2">
+                <div class="myHeading white mx-auto">Built upon the philosophy
+                    of users' freedom
+                </div>
+            </div>
+        </section>
+    </template>
+</odoo>
\ No newline at end of file
diff --git a/forksand_website/views/home_view.xml b/forksand_website/views/home_view.xml
deleted file mode 100644
index b84ff29..0000000
--- a/forksand_website/views/home_view.xml
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-
-    <template id="assets_frontend" name="Custom styles"
-              inherit_id="web.assets_frontend">
-        <xpath expr="." position="inside">
-            <link rel='stylesheet'
-                  href='/forksand_website/static/src/css/scrolling-nav.css'/>
-            <link rel='stylesheet'
-                  href='/forksand_website/static/src/css/baguetteBox.min.css'/>
-            <script type="text/javascript"
-                    src="/forksand_website/static/src/js/scrolling-nav.js"></script>
-            <script type="text/javascript"
-                    src="/forksand_website/static/src/js/baguetteBox.min.js"></script>
-            <script>
-                baguetteBox.run('.tz-gallery');
-            </script>
-        </xpath>
-    </template>
-
-    <template id="website.homepage" priority="29" name="Home">
-
-        <t t-call="website.layout">
-            <t t-set="pageName" t-value="'homepage'"/>
-            <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.media"/>
-                <t t-call="forksand_website.contact"/>
-            </div>
-        </t>
-    </template>
-
-
-    <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"/>
-
-                <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">Free Software</a>
-                    <a class="btn btn-light btnRoundded buttonMargin sr-button js-scroll-trigger"
-                       href="#media">Open Source Hardware</a>
-                </div>
-            </div>
-        </div>
-    </template>
-
-    <template id="forksand_website.about" name="About">
-        <div class="section1" id="about">
-            <div class="case-study showcase-bottom">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-md-12">
-                            <div class="title text-center">
-
-                                <h1 class="Brown">About Us</h1>
-
-                                <div class="myHeading">Fork Sand, Inc. is a free
-                                    Software, Open Source
-                                    <br/>
-                                    Hardware company developing Secure computing
-                                    <br/>
-                                    devices that guard users&#39; privacy.
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </template>
-
-    <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="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="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 class="row">
-                        <div class="col-md-4">
-                            <a class="lightbox"
-                               href="forksand_website/static/src/img/media/freecadhifi.png">
-                                <img alt="Bridge"
-                                     class="img-fluid img-thumbnail img2"
-                                     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/media/IMG_20180117_231522.jpg">
-                                <img alt="Bridge"
-                                     class="img-fluid img-thumbnail img2"
-                                     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/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>
-
-                    <div class="row">
-                        <div class="col-md-4">
-                            <a class="lightbox"
-                               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/media/IMG_20180118_182121.jpg"/>
-                            </a>
-                        </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="col-md-4">
-                            <a class="lightbox"
-                               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/media/IMG_20180118_190156.jpg"/>
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </section>
-
-        <section class="section showcase-bottom">
-            <div class="card col-md-12 container bg-primary text-white text-center p-2">
-                <div class="myHeading white mx-auto">Built upon the philosophy
-                    of users' freedom
-                </div>
-            </div>
-        </section>
-    </template>
-
-    <template id="forksand_website.contact" name="Contact Forksand">
-        <div class="container">
-            <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">
-                        <form action="/website_form/" method="post" data-model_name="crm.lead" data-success_page="/contactus-thank-you" class="s_website_form form-horizontal container-fluid mt32" enctype="multipart/form-data" data-editable-form="false">
-                        <div class="form-group form-field o_website_form_required_custom">
-                            <label class="col-md-3 col-sm-4 control-label" for="contact_name">Your Name</label>
-                            <div class="col-md-7 col-sm-8">
-                                <input type="text" class="form-control o_website_form_input" name="contact_name" t-att-value="request.params.get('contact_name', '')" required=""/>
-                            </div>
-                        </div>
-                        <div class="form-group form-field">
-                            <label class="col-md-3 col-sm-4 control-label" for="phone">Phone Number</label>
-                            <div class="col-md-7 col-sm-8">
-                                <input type="text" class="form-control o_website_form_input" name="phone" t-att-value="request.params.get('phone', '')"/>
-                            </div>
-                        </div>
-                        <div class="form-group form-field o_website_form_required_custom">
-                            <label class="col-md-3 col-sm-4 control-label" for="email_from">Email</label>
-                            <div class="col-md-7 col-sm-8">
-                                <input type="text" class="form-control o_website_form_input" name="email_from" required="" t-att-value="request.params.get('email_from', '')"/>
-                            </div>
-                        </div>
-                        <div class="form-group form-field o_website_form_required_custom">
-                            <label class="col-md-3 col-sm-4 control-label" for="partner_name">Your Company</label>
-                            <div class="col-md-7 col-sm-8">
-                                <input type="text" class="form-control o_website_form_input" name="partner_name" required="" t-att-value="request.params.get('partner_name', '')"/>
-                            </div>
-                        </div>
-                        <div class="form-group form-field o_website_form_required">
-                            <label class="col-md-3 col-sm-4 control-label" for="name">Subject</label>
-                            <div class="col-md-7 col-sm-8">
-                                <input type="text" class="form-control o_website_form_input" name="name" required="" t-att-value="request.params.get('name', '')"/>
-                            </div>
-                        </div>
-                        <div class="form-group form-field o_website_form_required_custom">
-                            <label class="col-md-3 col-sm-4 control-label" for="description">Your Question</label>
-                            <div class="col-md-7 col-sm-8">
-                                <textarea class="form-control o_website_form_input" name="description" required=""><t t-esc="request.params.get('description', '')"/></textarea>
-                            </div>
-                        </div>
-                        <div class="form-group">
-                            <div class="col-md-offset-3 col-sm-offset-4 col-sm-8 col-md-7">
-                                <span class="btn btn-primary btn-lg o_website_form_send">Send</span>
-                                <span id="o_website_form_result"/>
-                            </div>
-                        </div>
-                    </form>
-                    </div>
-                </div>
-                <div class="col-md-4 mb32">
-                    <img class="img-fluid" src="forksand_website/static/src/img/BC.png"/>
-                </div>
-            </div>
-        </div>
-    </template>
-</odoo>
\ No newline at end of file
diff --git a/forksand_website/views/homepage.xml b/forksand_website/views/homepage.xml
new file mode 100644
index 0000000..b6aabe1
--- /dev/null
+++ b/forksand_website/views/homepage.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <template id="website.homepage" priority="29" name="Home">
+
+        <t t-call="website.layout">
+            <t t-set="pageName" t-value="'homepage'"/>
+            <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.media"/>
+                <t t-call="forksand_website.contact"/>
+            </div>
+        </t>
+    </template>
+
+</odoo>
\ No newline at end of file
diff --git a/forksand_website/views/nav_menu_entries.xml b/forksand_website/views/nav_menu_entries.xml
new file mode 100644
index 0000000..c32e621
--- /dev/null
+++ b/forksand_website/views/nav_menu_entries.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="about_us_page" model="website.menu">
+        <field name="name">About Us</field>
+        <field name="url">/aboutus</field>
+        <field name="parent_id" ref="website.main_menu" />
+        <field name="sequence" type="int">45</field>
+        <field name="website_id" ref="website.default_website"/>
+    </record>
+
+</odoo>
\ No newline at end of file