diff --git a/addons/website/static/src/img/blocks/block_separator.png b/addons/website/static/src/img/blocks/block_separator.png
deleted file mode 100644
index 468d75656e0..00000000000
Binary files a/addons/website/static/src/img/blocks/block_separator.png and /dev/null differ
diff --git a/addons/website/static/src/less/website.snippets.less b/addons/website/static/src/less/website.snippets.less
index de57aa7da97..f9fa1b6cbf2 100644
--- a/addons/website/static/src/less/website.snippets.less
+++ b/addons/website/static/src/less/website.snippets.less
@@ -1,407 +1,396 @@
 // General rules
-// =============================
-
 .carousel, .parallax, .blockquote {
-  overflow: hidden;
+    overflow: hidden;
 }
 
 @media (max-width: 400px) {
-  section, .parallax, .row, .hr, .blockquote {
-    height: auto !important;
-  }
+    section, .parallax, .row, .hr, .blockquote {
+        height: auto !important;
+    }
 }
 
-
 // Table Snippet
-// =============================
-
 .table_desc {
-  margin: 0 0 20px 0;
-  width: 100%;
-  word-break: break-all;
-  border: 1px solid #dddddd;
+    margin: 0 0 20px 0;
+    width: 100%;
+    word-break: break-all;
+    border: 1px solid #dddddd;
 }
 
 .table_heading {
-  background-color: #f5f5f5;
-  border: 1px solid #dddddd;
-  color: #666666;
-  font-size: 14px;
-  padding: 4px;
+    background-color: #f5f5f5;
+    border: 1px solid #dddddd;
+    color: #666666;
+    font-size: 14px;
+    padding: 4px;
 }
 
 table.table_desc tr td {
-  text-align: left;
-  padding: 5px;
-  font-size: 13px;
-  &:first-child{
-    width: 25%;
-    font-weight: bold;
-    border-bottom: 1px solid #c9c9c9;
-    border-right: 1px solid #c9c9c9;
-    border-left: none;
-  }
-  &:last-child{
-    border-bottom: 1px solid #c9c9c9;
-  }
+    text-align: left;
+    padding: 5px;
+    font-size: 13px;
+    &:first-child {
+        width: 25%;
+        font-weight: bold;
+        border-bottom: 1px solid #c9c9c9;
+        border-right: 1px solid #c9c9c9;
+        border-left: none;
+    }
+    &:last-child {
+        border-bottom: 1px solid #c9c9c9;
+    }
 }
 
-/* other snippet styles */
+// Other snippet styles
 .s_comparisons .panel .list-group-item:not(.active) {
-  color: #666;
+    color: #666;
 }
 
 .s_references .img-thumbnail {
-  border: none;
+    border: none;
 }
 
 // o_image_floating
-// =============================
-
 .o_image_floating {
-  width: 40%;
-  margin: 4px;
-  div.o_container {
-    position: relative;
-    mark {
-      display: block;
-      position: absolute;
-      bottom: 0;
-      width: 100%;
-      background-color: rgba(86, 61, 124, 0.25);
-      a {
-        color: white;
-      }
+    width: 40%;
+    margin: 4px;
+    div.o_container {
+        position: relative;
     }
-  }
-}
-.o_image_floating.o_hide_link div.o_container mark {
-  display: none;
-}
-.o_image_floating.o_margin_s {
-  margin-bottom: 4px;
-}
-.o_image_floating.o_margin_s.pull-right {
-  margin-left: 8px;
-}
-.o_image_floating.o_margin_s.pull-left {
-  margin-right: 8px;
-}
-.o_image_floating.o_margin_m {
-  margin-bottom: 8px;
-}
-.o_image_floating.o_margin_m.pull-right {
-  margin-left: 12px;
-}
-.o_image_floating.o_margin_m.pull-left {
-  margin-right: 12px;
-}
-.o_image_floating.o_margin_l {
-  margin-bottom: 12px;
-}
-.o_image_floating.o_margin_l.pull-right {
-  margin-left: 16px;
-}
-.o_image_floating.o_margin_l.pull-left {
-  margin-right: 16px;
-}
-.o_image_floating.o_margin_xl {
-  margin-bottom: 24px;
-}
-.o_image_floating.o_margin_xl.pull-right {
-  margin-left: 32px;
-}
-.o_image_floating.o_margin_xl.pull-left {
-  margin-right: 32px;
-}
 
+    &.o_margin_s {
+        margin-bottom: 4px;
+    }
+    &.o_margin_s.pull-right {
+        margin-left: 8px;
+    }
+    &.o_margin_s.pull-left {
+        margin-right: 8px;
+    }
+    &.o_margin_m {
+        margin-bottom: 8px;
+    }
+    &.o_margin_m.pull-right {
+        margin-left: 12px;
+    }
+    &.o_margin_m.pull-left {
+        margin-right: 12px;
+    }
+    &.o_margin_l {
+        margin-bottom: 12px;
+    }
+    &.o_margin_l.pull-right {
+        margin-left: 16px;
+    }
+    &.o_margin_l.pull-left {
+        margin-right: 16px;
+    }
+    &.o_margin_xl {
+        margin-bottom: 24px;
+    }
+    &.o_margin_xl.pull-right {
+        margin-left: 32px;
+    }
+    &.o_margin_xl.pull-left {
+        margin-right: 32px;
+    }
+}
 
 // carousel
-// =============================
-
 .carousel-inner {
-  height: 100%;
-  .item {
     height: 100%;
-    background-size: cover;
-  }
-  .carousel-control {
-    cursor: pointer;
-    span {
-      top: 50%;
-      position: absolute;
-      margin-top: -8px;
+    .item {
+        height: 100%;
+        background-size: cover;
+    }
+    .carousel-control {
+        cursor: pointer;
+        span {
+            top: 50%;
+            position: absolute;
+            margin-top: -8px;
+        }
     }
-  }
 }
-.carousel .carousel-control.left {
-  left: -10px;
-  * {
-    position: absolute;
-    top: 50%;
-    z-index: 5;
-    right: 50%;
-  }
-}
-.carousel .carousel-control.right {
-  right: -10px;
-  * {
-    position: absolute;
-    top: 50%;
-    z-index: 5;
-    left: 50%;
-  }
+.carousel .carousel-control {
+    &.left {
+        left: -10px;
+        * {
+            position: absolute;
+            top: 50%;
+            z-index: 5;
+            right: 50%;
+        }
+    }
+    &.right {
+        right: -10px;
+        * {
+            position: absolute;
+            top: 50%;
+            z-index: 5;
+            left: 50%;
+        }
+    }
 }
 .quotecarousel {
-  padding-bottom: 16px;
+    padding-bottom: 16px;
 }
 
-div.carousel .container{
-  > .carousel-caption {
-    position: absolute;
-    right: 50%;
-    left: 50%;
-    bottom: 20px;
-    > div {
-      position: absolute;
-      text-align: left;
-      padding: 20px;
-      background: rgba(0, 0, 0, 0.4);
-      bottom: 20px;
+div.carousel .container {
+    > .carousel-caption {
+        .o-position-absolute(@right: 50%, @left: 50%);
+        bottom: 20px;
+        > div {
+            position: absolute;
+            text-align: left;
+            padding: 20px;
+            background: rgba(0, 0, 0, 0.4);
+            bottom: 20px;
+        }
     }
-  }
-  > .carousel-image {
-    top: 5%;
-    bottom: 5%;
-    position: absolute;
-    max-height: 90%;
-    margin: 0 auto;
-  }
-  .item.text_image .container > .carousel-caption {
-    left: 10%;
-    > div {
-      right: 50%;
-      margin-right: -20%;
-      max-width: 550px;
+    > .carousel-image {
+        .o-position-absolute(@top: 5%, @bottom: 5%);
+        max-height: 90%;
+        margin: 0 auto;
     }
-  }
-  .item.text_image .container > .carousel-image {
-    right: 10%;
-    left: 50%;
-  }
-  .item.image_text .container > .carousel-caption {
-    right: 10%;
-    > div {
-      left: 50%;
-      margin-left: -20%;
-      max-width: 550px;
+    .item.text_image .container {
+        > .carousel-caption {
+            left: 10%;
+            > div {
+                right: 50%;
+                margin-right: -20%;
+                max-width: 550px;
+            }
+        }
+        > .carousel-image {
+            right: 10%;
+            left: 50%;
+        }
     }
-  }
-  .item.image_text .container > .carousel-image {
-    right: 50%;
-    left: 10%;
-  }
-  .item.text_only .container > .carousel-caption {
-    left: 10%;
-    right: 10%;
-    top: 10%;
-    bottom: auto;
-    > div {
-      text-align: center;
-      background: transparent;
-      bottom: auto;
-      width: 100%;
+    .item.image_text .container {
+        > .carousel-caption {
+            right: 10%;
+            > div {
+                left: 50%;
+                margin-left: -20%;
+                max-width: 550px;
+            }
+        }
+        > .carousel-image {
+            right: 50%;
+            left: 10%;
+        }
+    }
+    .item.text_only .container {
+        > .carousel-caption {
+            left: 10%;
+            right: 10%;
+            top: 10%;
+            bottom: auto;
+            > div {
+                text-align: center;
+                background: transparent;
+                bottom: auto;
+                width: 100%;
+            }
+        }
+        > .carousel-image {
+            display: none !important;
+        }
     }
-  }
-  .item.text_only .container > .carousel-image {
-    display: none !important;
-  }
 }
 
 // Gallery
-// ====================================
+.o_gallery {
+    &.o_grid, &.o_masonry {
+        .img {
+            width: 100%;
+        }
+    }
+    &.o_grid {
+        &.o_spc-none div.row {
+            margin: 0;
+            * {
+                padding: 0;
+            }
+        }
+        &.o_spc-small div.row {
+            margin: 5px 0;
+            * {
+                padding: 0 5px;
+            }
+        }
+        &.o_spc-medium div.row {
+            margin: 10px 0;
+            * {
+                padding: 0 10px;
+            }
+        }
+        &.o_spc-big div.row {
+            margin: 15px 0;
+            * {
+                padding: 0 15px;
+            }
+        }
 
-.o_gallery.o_grid .img,
-.o_gallery.o_masonry .img {
-  width: 100%;
+        &.size-auto .row {
+            height: auto;
+        }
+        &.size-small .row {
+            height: 100px;
+        }
+        &.size-medium .row {
+            height: 250px;
+        }
+        &.size-big .row {
+            height: 400px;
+        }
+        &.size-small, &.size-medium, &.size-big {
+            img {
+                height: 100%;
+            }
+        }
+    }
+    &.o_masonry {
+        &.o_spc-none div.col {
+            padding: 0;
+            > img {
+                margin: 0 !important;
+            }
+        }
+        &.o_spc-small div.col {
+            padding: 0 5px;
+            > img {
+                margin: 5px 0 !important;
+            }
+        }
+        &.o_spc-medium div.col {
+            padding: 0 10px;
+            > img {
+                margin: 10px 0 !important;
+            }
+        }
+        &.o_spc-big div.col {
+            padding: 0 15px;
+            > img {
+                margin: 15px 0 !important;
+            }
+        }
+    }
+    &.o_nomode {
+        &.o_spc-none .img {
+            padding: 0;
+        }
+        &.o_spc-small .img {
+            padding: 5px;
+        }
+        &.o_spc-medium .img {
+            padding: 10px;
+        }
+        &.o_spc-big .img {
+            padding: 15px;
+        }
+    }
+    &.o_slideshow {
+        .carousel ul.carousel-indicators li {
+            border: 1px solid #aaa;
+        }
+        > .container {
+            height: 100%;
+        }
+    }
+    .carousel-inner .item img {
+        max-width: none;
+    }
 }
+.o_gallery, .modal-body {
+    &.o_slideshow {
+        .carousel {
+            height: 100%;
 
-.o_gallery.o_grid.o_spc-none div.row {
-  margin: 0;
-  * {
-    padding: 0;
-  }
-}
-.o_gallery.o_grid.o_spc-small div.row {
-  margin: 5px 0;
-  * {
-    padding: 0 5px;
-  }
-}
-.o_gallery.o_grid.o_spc-medium div.row {
-  margin: 10px 0;
-  * {
-    padding: 0 10px;
-  }
-}
-.o_gallery.o_grid.o_spc-big div.row {
-  margin: 15px 0;
-  * {
-    padding: 0 15px;
-  }
-}
-.o_gallery.o_masonry.o_spc-none div.col {
-  padding: 0;
-  > img {
-    margin: 0 !important;
-  }
-}
-.o_gallery.o_masonry.o_spc-small div.col {
-  padding: 0 5px;
-  > img {
-    margin: 5px 0 !important;
-  }
-}
-.o_gallery.o_masonry.o_spc-medium div.col {
-  padding: 0 10px;
-  > img {
-    margin: 10px 0 !important;
-  }
-}
-.o_gallery.o_masonry.o_spc-big div.col {
-  padding: 0 15px;
-  > img {
-    margin: 15px 0 !important;
-  }
-}
-.o_gallery.o_grid.size-auto .row {
-  height: auto;
-}
-.o_gallery.o_grid.size-small .row {
-  height: 100px;
-}
-.o_gallery.o_grid.size-medium .row {
-  height: 250px;
-}
-.o_gallery.o_grid.size-big .row {
-  height: 400px;
-}
-.o_gallery.o_grid.size-small .img,
-.o_gallery.o_grid.size-medium .img,
-.o_gallery.o_grid.size-big .img {
-  height: 100%;
-}
+            .item {
+                padding-bottom: 64px;
+            }
 
-.o_gallery.o_nomode.o_spc-none .img {
-  padding: 0;
-}
-.o_gallery.o_nomode.o_spc-small .img {
-  padding: 5px;
-}
-.o_gallery.o_nomode.o_spc-medium .img {
-  padding: 10px;
-}
-.o_gallery.o_nomode.o_spc-big .img {
-  padding: 15px;
-}
+            img {
+                max-height: 100%;
+                max-width: 100%;
+                margin: auto;
+                position: relative;
+                top: 50%;
+                .translate(0, -50%);
+            }
 
-.o_gallery.o_slideshow .carousel ul.carousel-indicators li {
-  border: 1px solid #aaa;
-}
-.o_gallery .carousel-inner .item img {
-  max-width: none;
-}
-.o_gallery.o_slideshow > .container {
-  height: 100%;
-}
+            ul.carousel-indicators {
+                display: block;
+                height: auto;
+                padding: 0;
+                border-width: 0;
+                position: absolute;
+                bottom: 0;
 
-.o_gallery.o_slideshow .carousel,
-.modal-body.o_slideshow .carousel {
-  height: 100%;
-}
-.o_gallery.o_slideshow .carousel .item,
-.modal-body.o_slideshow .carousel .item {
-  padding-bottom: 64px;
-}
-.o_gallery.o_slideshow .carousel img,
-.modal-body.o_slideshow .carousel img {
-  max-height: 100%;
-  max-width: 100%;
-  margin: auto;
-  position: relative;
-  top: 50%;
-  .translateY(-50%);
-}
-.o_gallery.o_slideshow .carousel ul.carousel-indicators,
-.modal-body.o_slideshow .carousel ul.carousel-indicators {
-  display: block;
-  height: auto;
-  padding: 0;
-  border-width: 0;
-  position: absolute;
-  bottom: 0;
-}
-.o_gallery.o_slideshow .carousel ul.carousel-indicators > *,
-.modal-body.o_slideshow .carousel ul.carousel-indicators > * {
-  list-style-image: none;
-  display: inline-block;
-  width: 40px;
-  height: 40px;
-  margin: 0 0px 5px 5px;
-  padding: 0;
-  border: 1px solid #aaa;
-  text-indent: initial;
-  background-size: cover;
-  background-color: #fff;
-  border-radius: 0;
-}
-.o_gallery.o_slideshow .carousel ul.carousel-indicators > *:not(.active),
-.modal-body.o_slideshow .carousel ul.carousel-indicators > *:not(.active) {
-  opacity: 0.8;
-  -webkit-filter: grayscale(100%);
-  filter: grayscale(100%);
-  filter: gray;
-  filter: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' height='0'><filter id='greyscale'><feColorMatrix type='matrix' values='0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0' /></filter></svg>#greyscale");
-}
-.o_gallery.o_slideshow .carousel .carousel-control.left,
-.o_gallery.o_slideshow .carousel .carousel-control.right,
-.modal-body.o_slideshow .carousel .carousel-control.left,
-.modal-body.o_slideshow .carousel .carousel-control.right {
-  background-image: none;
-  background-color: transparent;
+                > * {
+                    list-style-image: none;
+                    display: inline-block;
+                    width: 40px;
+                    height: 40px;
+                    margin: 0 0px 5px 5px;
+                    padding: 0;
+                    border: 1px solid #aaa;
+                    text-indent: initial;
+                    background-size: cover;
+                    background-color: #fff;
+                    border-radius: 0;
+
+                    &:not(.active) {
+                        opacity: 0.8;
+                        -webkit-filter: grayscale(100%);
+                        filter: grayscale(100%);
+                        filter: gray;
+                        filter: url("data:image/svg+xml;utf8,<svg version='1.1' xmlns='http://www.w3.org/2000/svg' height='0'><filter id='greyscale'><feColorMatrix type='matrix' values='0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0.3333 0.3333 0.3333 0 0 0 0 0 1 0' /></filter></svg>#greyscale");
+                    }
+                }
+            }
+
+            .carousel-control {
+                &.right, &.left {
+                    background-image: none;
+                    background-color: transparent;
+                }
+            }
+        }
+    }
 }
 
 // Parallax Theme
-// ==========================
-
-div.carousel{
-  .carousel-indicators{
-    li { border: 1px solid grey; }
-    .active { background-color: grey; }
-  }
-  span.carousel-img img,
-  div.carousel-content {
-    max-height: 95%;
-    padding: 10px;
-  }
-  div.carousel-content {
-    background-color: black;
-    color: white;
-    background: rgba(0, 0, 0, 0.3);
-  }
+div.carousel {
+    .carousel-indicators {
+        li { border: 1px solid grey; }
+        .active { background-color: grey; }
+    }
+    span.carousel-img img,
+    div.carousel-content {
+        max-height: 95%;
+        padding: 10px;
+    }
+    div.carousel-content {
+        background-color: black;
+        color: white;
+        background: rgba(0, 0, 0, 0.3);
+    }
 }
 
 .parallax {
-  background-size: cover;
-  > div {
-    position: relative;
-    display: table;
-    width: 100%;
-    min-height: 200px;
+    background-size: cover;
     > div {
-      display: table-cell;
-      vertical-align: middle;
-      padding: 32px 0;
+        position: relative;
+        display: table;
+        width: 100%;
+        min-height: 200px;
+        > div {
+            display: table-cell;
+            vertical-align: middle;
+            padding: 32px 0;
+        }
     }
-  }
 }
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 6e49bc09601..62269ba2a6c 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data>
-
+<odoo>
 <template id="s_banner" name="Banner">
-    <div id="myCarousel" class="carousel slide s_banner oe_custom_bg mb32" data-interval="10000" style="height: 320px;">
+    <div id="myCarousel" class="carousel slide s_banner oe_custom_bg" data-interval="10000" style="height: 320px;">
         <!-- Indicators -->
         <ol class="carousel-indicators hidden">
             <li data-target="#myCarousel" data-slide-to="0" class="active"></li>
@@ -77,51 +75,8 @@
     </section>
 </template>
 
-<template id="s_text_image_floating" name="Image Float">
-    <section class="s_text_image_floating">
-        <div class="container">
-            <div class="row">
-                <div class="col-md-12 mb16 mt16">
-                    <div class="o_image_floating o_margin_l pull-right">
-                        <div class="o_container">
-                            <img class="img img-rounded img-responsive" src="/website/static/src/img/odoo.jpg"  alt="Odoo Members"/>
-                            <mark class="text-center"><a href="#"><strong>Click Here</strong></a></mark>
-                        </div>
-                        <div class="o_footer">
-                            <small class="text-muted">A great way to catch your reader's attention is to tell a story. Everything you consider writing can be told as a story.</small>
-                        </div>
-                    </div>
-                    <h3>What a day it was yesterday - such a big day for us!</h3>
-                    <p style="text-align: justify;">
-                        In case you still feel a bit puzzled about all
-                        of our yesterday's announcements, here is a little
-                        summary for you. <br/>
-                        We have decided to change the
-                        name because <b>"OpenERP"</b> didn't reflect the offering
-                        of the company anymore. With our newest apps, such
-                        as Website Builder, PoS or eCommerce, we have
-                        moved beyond the ERP territory. <br/>
-                        But <u>don't worry</u>, <b>Odoo</b> is and always will be
-                        fully open source. You can read more about the new name here.
-                        We have also prepared a short FAQ to explain all these changes
-                        to all of you. <br/>
-                    </p>
-                    <h3>Discover more about Odoo</h3>
-                    <p style="text-align: justify;">
-                        With Odoo's fully integrated software, you can easily manage your
-                        meetings, schedule business calls, create recurring meetings,
-                        synchronize your agenda and easily keep in touch with your colleagues,
-                        partners and other people involved in projects or business discussions.
-                        <br/><br/><a href="#">Check now and discover more today!</a>
-                    </p>
-                </div>
-            </div>
-        </div>
-    </section>
-</template>
-
 <template id="s_big_message" name="Big message">
-    <section class="jumbotron s_big_message mt16 mb16">
+    <section class="jumbotron s_big_message">
         <div class="container">
             <h1>Sell Online. Easily.</h1>
             <p>
@@ -183,7 +138,7 @@
 </template>
 
 <template id="s_features" name="Features">
-    <section class="s_features mt16">
+    <section class="s_features">
         <div class="container">
             <div class="row mt16 mb16">
                 <div class="col-md-4 text-center">
@@ -207,7 +162,7 @@
 </template>
 
 <template id="s_big_picture" name="Big Picture">
-    <section class="s_big_picture bg-primary mt16 mb16">
+    <section class="s_big_picture bg-primary">
         <div class="container">
             <div class="row">
                 <div class="col-md-12 text-center mt32 mb32">
@@ -235,10 +190,10 @@
 </template>
 
 <template id="s_three_columns" name="Three Columns">
-    <section class="s_three_columns mt16 mb16">
+    <section class="s_three_columns">
         <div class="container">
             <div class="row">
-                <div class="col-md-4">
+                <div class="col-md-4 mt16">
                     <img class="img img-rounded img-responsive" src="/website/static/src/img/desert_thumb.jpg" alt="Odoo - Sample 1 for three columns"/>
                     <h4 class="mt16">Feature One</h4>
                     <p>
@@ -247,7 +202,7 @@
                         column and use the top icons to perform your action.
                     </p>
                 </div>
-                <div class="col-md-4">
+                <div class="col-md-4 mt16">
                     <img class="img img-rounded img-responsive" src="/website/static/src/img/deers_thumb.jpg" alt="Odoo - Sample 2 for three columns"/>
                     <h4 class="mt16">Feature Two</h4>
                     <p>
@@ -257,7 +212,7 @@
                         one as a copy.
                     </p>
                 </div>
-                <div class="col-md-4">
+                <div class="col-md-4 mt16">
                     <img class="img img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg" alt="Odoo - Sample 3 for three columns"/>
                     <h4 class="mt16">Feature Three</h4>
                     <p>
@@ -283,8 +238,8 @@
 <template id="s_quote" name="Quote">
     <blockquote class="s_quote">
         <p>
-Write a quote here from one of your customers. Quotes are a
-great way to build confidence in your products or services.
+            Write a quote here from one of your customers. Quotes are a
+            great way to build confidence in your products or services.
         </p>
         <p><small>Author of this quote</small></p>
     </blockquote>
@@ -308,7 +263,6 @@ great way to build confidence in your products or services.
     <div class="o_image_floating o_margin_l pull-right s_image_floating">
         <div class="o_container">
             <img class="img img-rounded img-responsive" src="/website/static/src/img/library/ipad.png" alt="Odoo CMS- Sample image floating"/>
-            <mark class="text-center"><a href="#"><strong>Click Here</strong></a></mark>
         </div>
         <div class="o_footer">
             <small class="text-muted">A great way to catch your reader's attention is to tell a story. Everything you consider writing can be told as a story.</small>
@@ -316,10 +270,6 @@ great way to build confidence in your products or services.
     </div>
 </template>
 
-<template id="s_separator" name="Separator">
-    <hr class="s_separator"/>
-</template>
-
 <template id="s_share" name="Share">
     <div class="oe_share s_share">
         <h3>
@@ -465,48 +415,6 @@ great way to build confidence in your products or services.
     </section>
 </template>
 
-<template id="s_faq" name="FAQ">
-    <section class="s_faq">
-        <div class="container">
-            <h2 class="page-header">
-                Point of Sale Questions <small>v7</small>
-            </h2>
-            <h3>
-                Which hardware does Odoo POS support?
-            </h3>
-            <p>
-                Odoo's POS is a web application that can run on any device that
-                can display websites with little to no setup required.
-            </p><p>
-                The Point of Sale works perfectly on any kind of touch enabled
-                device, whether it's multi-touch tablets like an iPad or
-                keyboardless resistive touchscreen terminals.
-            </p>
-            <h3>
-                Does it works offline?
-            </h3>
-            <p>
-                Deploy new stores with just an internet connection: no
-                installation, no specific hardware required. It works with any
-                iPad, Tablet PC, laptop or industrial POS machine.
-            </p><p>
-                While an internet connection is required to start the Point of
-                Sale, it will stay operational even after a complete disconnection.
-            </p>
-
-            <h2 class="page-header">
-                Project Management Questions <small>v7</small>
-            </h2>
-            <h3>
-                Can I use it to manage projects based on agile methodologies?
-            </h3>
-            <p>
-                Yes.
-            </p>
-        </div>
-    </section>
-</template>
-
 <template id="s_faq_collapse" name="FAQ Roller">
     <section class="s_faq_collapse">
         <div class="container">
@@ -570,7 +478,7 @@ great way to build confidence in your products or services.
 </template>
 
 <template id="s_references" name="References">
-    <section class="s_references mt16 mb32">
+    <section class="s_references">
         <div class="container">
             <div class="row">
                 <div class="col-md-12">
@@ -581,11 +489,13 @@ great way to build confidence in your products or services.
                         More than 500 happy customers.
                     </h3>
                 </div>
+            </div>
+            <div class="row">
                 <div class="col-md-4 col-xs-12 col-md-offset-1 mt16 mb32">
                     <blockquote>
                         <p>
-Write a quote here from one of your customers. Quotes are a
-great way to build confidence in your products or services.
+                            Write a quote here from one of your customers. Quotes are a
+                            great way to build confidence in your products or services.
                         </p>
                         <small>Author of this quote</small>
                     </blockquote>
@@ -593,12 +503,14 @@ great way to build confidence in your products or services.
                 <div class="col-md-4 col-xs-12 col-md-offset-2 mt16 mb32">
                     <blockquote>
                         <p>
-Odoo provides essential platform for our project management.
-Things are better organized and more visible with it.
+                            Odoo provides essential platform for our project management.
+                            Things are better organized and more visible with it.
                         </p>
                         <small>John Doe, CEO</small>
                     </blockquote>
                 </div>
+            </div>
+            <div class="row">
                 <div class="col-md-2 col-sm-4 col-xs-6">
                   <img src="/logo.png" class="img img-responsive img-thumbnail" alt="Logo"/>
                 </div>
@@ -623,7 +535,7 @@ Things are better organized and more visible with it.
 </template>
 
 <template id="s_quotes_slider" name="Quotes Slider">
-    <div id="myQuoteCarousel" class="carousel quotecarousel slide s_quotes_slider mb0" data-interval="10000">
+    <div id="myQuoteCarousel" class="carousel quotecarousel slide s_quotes_slider" data-interval="10000">
         <!-- Indicators -->
         <ol class="carousel-indicators mb0">
             <li data-target="#myQuoteCarousel" data-slide-to="0" class="active"></li>
@@ -638,8 +550,8 @@ Things are better organized and more visible with it.
                         <div class="row">
                             <blockquote class="mt48 mb16 col-md-4 col-md-offset-4">
                                     <p>
-Write a quote here from one of your customers. Quotes are a
-great way to build confidence in your products or services.
+                                        Write a quote here from one of your customers. Quotes are a
+                                        great way to build confidence in your products or services.
                                     </p>
                                     <small>Author of this quote</small>
                             </blockquote>
@@ -656,8 +568,8 @@ great way to build confidence in your products or services.
                         <div class="row">
                             <blockquote class="mt48 mb16 col-md-4 col-md-offset-4">
                                     <p>
-Odoo provides essential platform for our project management.
-Things are better organized and more visible with it.
+                                        Odoo provides essential platform for our project management.
+                                        Things are better organized and more visible with it.
                                     </p>
                                     <small>John Doe, CEO</small>
                             </blockquote>
@@ -675,7 +587,7 @@ Things are better organized and more visible with it.
     <section class="s_feature_grid">
         <div class="container">
             <div class="row">
-                <div class="col-md-5 text-center">
+                <div class="col-md-5">
                     <div class="col-md-12 mt16 mb16">
                         <h2>List of Features</h2>
                         <h4 class="text-muted">Add a great slogan</h4>
@@ -696,7 +608,7 @@ Things are better organized and more visible with it.
                         <p class="text-muted">Select and delete blocks to remove some features.</p>
                     </div>
                 </div>
-                <div class="col-md-5 text-center col-md-offset-2">
+                <div class="col-md-5 col-md-offset-2">
                     <div class="col-md-12 mt16 mb16">
                         <h2>Second List</h2>
                         <h4 class="text-muted">Add a great slogan</h4>
@@ -750,8 +662,8 @@ Things are better organized and more visible with it.
                                     <div class="row">
                                         <blockquote class="mt48 mb16 col-md-4 col-md-offset-4">
                                             <p>
-Write a quote here from one of your customers. Quotes are a
-great way to build confidence in your products or services.
+                                                Write a quote here from one of your customers. Quotes are a
+                                                great way to build confidence in your products or services.
                                             </p>
                                             <small>Author of this quote</small>
                                         </blockquote>
@@ -768,8 +680,8 @@ great way to build confidence in your products or services.
                                     <div class="row">
                                         <blockquote class="mt48 mb16 col-md-4 col-md-offset-4">
                                             <p>
-Odoo provides essential platform for our project management.
-Things are better organized and more visible with it.
+                                                Odoo provides essential platform for our project management.
+                                                Things are better organized and more visible with it.
                                             </p>
                                             <small>John Doe, CEO</small>
                                         </blockquote>
@@ -816,17 +728,15 @@ Things are better organized and more visible with it.
         <i class="material-icons">&#xE8F1;</i> Structure
     </div>
     <div class="o_panel_body">
+        <t t-snippet="website.s_title" t-thumbnail="/website/static/src/img/blocks/block_title.png"/>
         <t t-snippet="website.s_banner" t-thumbnail="/website/static/src/img/blocks/block_banner.png"/>
         <t t-snippet="website.s_text_image" t-thumbnail="/website/static/src/img/blocks/block_text_image.png"/>
         <t t-snippet="website.s_image_text" t-thumbnail="/website/static/src/img/blocks/block_image_text.png"/>
-        <t t-snippet="website.s_text_image_floating" t-thumbnail="/website/static/src/img/blocks/block_text_image.png"/>
         <t t-snippet="website.s_big_message" t-thumbnail="/website/static/src/img/blocks/block_jumbotron.png"/>
         <t t-snippet="website.s_text_block" t-thumbnail="/website/static/src/img/blocks/block_text_block.png"/>
-        <t t-snippet="website.s_title" t-thumbnail="/website/static/src/img/blocks/block_title.png"/>
         <t t-snippet="website.s_features" t-thumbnail="/website/static/src/img/blocks/block_features.png"/>
         <t t-snippet="website.s_big_picture" t-thumbnail="/website/static/src/img/blocks/block_big_picture.png"/>
         <t t-snippet="website.s_three_columns" t-thumbnail="/website/static/src/img/blocks/block_three_columns.png"/>
-        <t t-snippet="website.s_separator" t-thumbnail="/website/static/src/img/blocks/block_separator.png"/>
     </div>
 </div>
 
@@ -852,7 +762,6 @@ Things are better organized and more visible with it.
         <t t-snippet="website.s_comparisons" t-thumbnail="/website/static/src/img/blocks/block_comparison.png"/>
         <t t-snippet="website.s_button" t-thumbnail="/website/static/src/img/blocks/block_button.png"/>
         <t t-snippet="website.s_references" t-thumbnail="/website/static/src/img/blocks/block_references.png"/>
-        <t t-snippet="website.s_faq" t-thumbnail="/website/static/src/img/blocks/block_faq.png"/>
         <t t-snippet="website.s_faq_collapse" t-thumbnail="/website/static/src/img/blocks/block_faq.png"/>
         <t t-snippet="website.s_quotes_slider" t-thumbnail="/website/static/src/img/blocks/block_quotes_slider.png"/>
         <t t-snippet="website.s_feature_grid" t-thumbnail="/website/static/src/img/blocks/block_three_columns.png"/>
@@ -1062,10 +971,6 @@ Things are better organized and more visible with it.
         </li>
     </div>
 
-    <div data-selector=".o_image_floating">
-        <li data-toggle_class="o_hide_link"><a>Hide link</a></li>
-    </div>
-
     <div data-selector=".o_image_floating">
         <li class="dropdown-submenu">
             <a tabindex="-2" href="#">Float</a>
@@ -1101,7 +1006,4 @@ Things are better organized and more visible with it.
          data-drop-in='.panel-group:has(> .panel > .panel-collapse)'>
     </div>
 </template>
-
-
-</data>
-</openerp>
+</odoo>