diff --git a/.DS_Store b/.DS_Store
index 6989383..208aae8 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/website/assets/images/hero.png b/website/assets/images/hero.png
new file mode 100644
index 0000000..779cc88
Binary files /dev/null and b/website/assets/images/hero.png differ
diff --git a/website/assets/sass/style.sass b/website/assets/sass/style.sass
index e7df2ad..5680194 100644
--- a/website/assets/sass/style.sass
+++ b/website/assets/sass/style.sass
@@ -8,8 +8,8 @@
 // Colors
 $primary:       #c045b6 
 $primary-light: #e86be5
-$link:          #00D848 
-$link-light:    #38F987
+$link:          #529eba 
+$link-light:    #82c4dc
 $text:          #333
 
 // $link-invert:	$blue-invert
@@ -358,7 +358,11 @@ $shadow: 0 .1rem .4rem .1rem rgba(41, 41, 41, 0.1)
             background: $primary
     &.is-link
         background: $gradient-link
-        box-shadow: $shadow-link
+        // box-shadow: $shadow-link
+        color: #fff
+
+        &:hover
+            color: #fff
 
         &:before
             background: $link
@@ -681,30 +685,30 @@ main
     .main-content 
         padding-top: $header-height
 
-    &:before
-        content: ""
-        width: 14rem
-        height: 20rem
-        position: absolute
-        z-index: 0
-        top: 2rem
-        right: 0
+    // &:before
+    //     content: ""
+    //     width: 14rem
+    //     height: 20rem
+    //     position: absolute
+    //     z-index: 0
+    //     top: 2rem
+    //     right: 0
         // background: url('../images/svg/purple-mesh-rotate.svg') center no-repeat
 
-        @include tablet
-            display: none
-    &:after
-        content: ""
-        width: 30rem
-        height: 30rem
-        position: absolute
-        z-index: 0
-        top: 60%
-        right: 0
-        // background: url('../images/svg/green-donut.svg') center no-repeat
+        // @include tablet
+        //     display: none
+    // &:after
+    //     content: ""
+    //     width: 30rem
+    //     height: 30rem
+    //     position: absolute
+    //     z-index: 0
+    //     top: 60%
+    //     right: 0
+    //     // background: url('../images/svg/green-donut.svg') center no-repeat
 
-        @include tablet
-            display: none
+    //     @include tablet
+    //         display: none
 
 .has-bckg-grey
     background: #eee
diff --git a/website/components/AbsFooter.vue b/website/components/AbsFooter.vue
index 1e94995..0b827b5 100644
--- a/website/components/AbsFooter.vue
+++ b/website/components/AbsFooter.vue
@@ -31,8 +31,8 @@
         <svg viewBox="0 0 1330 419" class="footer-bckg">
             <defs>
                 <linearGradient x1="105.189448%" y1="108.514767%" x2="0%" y2="21.3648885%" id="linearGradient-1">
-                    <stop stop-color="#004FFF" offset="0%"></stop>
-                    <stop stop-color="#0093FF" offset="100%"></stop>
+                    <stop stop-color="#529eba" offset="0%"></stop>
+                    <stop stop-color="#82c4dc" offset="100%"></stop>
                 </linearGradient>
                 <linearGradient x1="90.7814356%" y1="19.4594161%" x2="8.02921532%" y2="86.6485037%" id="linearGradient-2">
                     <stop stop-color="#FFFFFF" offset="0%"></stop>
diff --git a/website/components/AbsMap.vue b/website/components/AbsMap.vue
deleted file mode 100644
index 35c162b..0000000
--- a/website/components/AbsMap.vue
+++ /dev/null
@@ -1,69 +0,0 @@
-<template>
-  <section class="section p0">
-    <div class="container">
-      <div class="box p0 oh m10">
-
-        <GmapMap
-            :center="{ lat: 42.017322, lng: 23.095913}"
-            :zoom="16"
-        >
-            <GmapMarker
-                :position="{ lat: 42.017322, lng: 23.095913}"
-            />
-        </GmapMap>
-
-        <!-- <mapbox
-          access-token="pk.eyJ1IjoiaHlhcHJha292IiwiYSI6ImNqcThjeGVoYzJ6emQ0OHIxdzFoN2c4N3MifQ.pm2dqcPXQmlvgMFmaUQAyQ"
-          :map-options="{
-                        style: 'mapbox://styles/mapbox/light-v9',
-                        center: [23.095913, 42.017322],
-                        zoom: 16
-                    }"
-          :geolocate-control="{
-                        show: true,
-                        position: 'top-left'
-                    }"
-          :scale-control="{
-                        show: true,
-                        position: 'top-left'
-                    }"
-          :fullscreen-control="{
-                        show: true,
-                        position: 'top-left'
-                    }"
-            @map-load="mapLoaded"
-        ></mapbox>-->
-      </div>
-    </div>
-  </section>
-</template>
-
-<script>
-
-import * as VueGoogleMaps from 'vue2-google-maps'
-
-Vue.use(VueGoogleMaps, {
-    load: {
-        key: 'AIzaSyCeUVNN4kP1WMKXswKrPUSdqDNrN7CY-6Y',
-    }
-})
-
-export default {
-    props: ["title", "desc"],
-    // components: {
-    //     MglMap
-    // },
-
-    data: function() {
-        return {
-            
-        };
-    },
-    methods: {
-        
-    },
-    computed: {
-
-    }
-};
-</script>
diff --git a/website/components/CurvedBox.vue b/website/components/CurvedBox.vue
deleted file mode 100644
index e82bbfa..0000000
--- a/website/components/CurvedBox.vue
+++ /dev/null
@@ -1,93 +0,0 @@
-<template>
-    <section class="section curved-section pt70 pt20t element-loader loading">
-        <h2 class="has-text-centered mb30" v-if="section_title">
-            {{ section_title }}
-        </h2>
-        <div class="container is-relative">
-            <svg viewBox="0 0 1032 315">
-                <defs>
-                    <path d="
-                        M 57, 64 L 1069, 64 C 1072, 64 1074, 66 1074,69 L 1074, 338 C 903, 350 733, 369 563, 369 C 393, 369 222, 359 52, 338 L 52, 69 C 52, 66 54, 64 57,64 Z" id="ref_curve"></path>
-                    <filter x="-0.8%" y="-2.3%" width="101.6%" height="105.2%" filterUnits="objectBoundingBox" id="shadow">
-                        <feMorphology radius="0.5" operator="dilate" in="SourceAlpha" result="shadowSpreadOuter1"></feMorphology>
-                        <feOffset dx="0" dy="1" in="shadowSpreadOuter1" result="shadowOffsetOuter1"></feOffset>
-                        <feGaussianBlur stdDeviation="3" in="shadowOffsetOuter1" result="shadowBlurOuter1"></feGaussianBlur>
-                        <feColorMatrix 
-                            values="
-                                0 0 0 0 0.3   
-                                0 0 0 0 0.3   
-                                0 0 0 0 0.3  
-                                0 0 0 0.3 0" 
-                            type="matrix" in="shadowBlurOuter1"></feColorMatrix>
-                    </filter>
-                </defs>
-                <clipPath id="clip_ref_curve">
-                    <use xlink:href="#ref_curve"  style="overflow:visible;"/>
-                </clipPath>
-                <g transform="translate(-149.000000, -2619.000000)">
-                    <g transform="translate(102.000000, 2559.000000)">
-                        <use fill="black" fill-opacity="1" filter="url(#shadow)" xlink:href="#ref_curve"></use>
-                        <use fill="#FFFFFF" xlink:href="#ref_curve"></use>
-                    </g>
-                </g>
-            </svg>
-            <div class="curved-content has-text-dark has-nostyle align-center b50">
-                <div class="columns flex-wrap is-full-width ml30 mr30" v-if="list">
-                    <div class="column is-3" v-for="info in list">
-                        <p class="mt0 mb5">{{ info.title }}</p>
-                        <h6 :class="{'has-info-tooltip': info.additional, 'lh1-1': true}">
-                            {{ info.desc }}
-
-                            <div class="info-tooltip" v-if="info.additional">
-                                <div class="box">
-                                    <h6 class="has-text-centered mb30">{{ info.additional.title }}</h6>
-
-                                    <div class="columns flex-wrap mb10">
-                                        <div class="column is-6 p0" v-for="entry in info.additional.texts">
-                                            <p class="mt0 mb5">
-                                                {{ entry.text }}
-                                            </p>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
-                        </h6>
-                    </div>
-                </div>
-                <div>
-                    <h2 class="has-text-centered mb30" v-if="box_title">
-                        {{ box_title }}
-                    </h2>
-                    <p v-if="desc" class="p0-50 has-text-centered">
-                        {{ desc }}
-                    </p>
-                </div>
-            </div>
-
-            <div class="illus purple-curves" v-if="has_illus"></div>
-            <div class="illus green-dashes" v-if="has_illus"></div>
-        </div>
-    </section>
-</template>
-
-<script>
-
-export default {
-    props: ['section_title', 'list', 'box_title', 'desc', 'has_illus'],
-
-    data: function () {
-        return {
-            
-        }
-    },
-    methods: {
-        
-    },
-    computed: {
-        
-    },
-    mounted: function () {
-        
-    }
-}
-</script>
diff --git a/website/components/CurvedSection.vue b/website/components/CurvedSection.vue
deleted file mode 100644
index 3f945b5..0000000
--- a/website/components/CurvedSection.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-    <section class="section curved-section element-loader loading">
-        <svg viewBox="0 0 1330 425">
-            <defs>
-                <path id="clip_path_curve" d="M5.01303218,3.50068867e-13 L1326,-7.01660952e-13 C1328.76142,-7.02168217e-13 1331,2.23857625 1331,5 L1331,384.165033 C1057.94603,404.721678 836.261132,415 665.945312,415 C495.629492,415 273.981055,404.721678 1,384.165033 L0.0130491189,5.0130152 C0.00586102485,2.2516008 2.23860259,0.00720503363 5.00001698,1.69395608e-05 C5.00435537,5.64652527e-06 5.00869378,3.34844061e-13 5.01303218,3.34843264e-13 Z"></path>
-            </defs>
-            <clipPath id="clip_curve">
-                <use xlink:href="#clip_path_curve"  style="overflow:visible;"/>
-            </clipPath>
-            <g style="clip-path:url(#clip_curve);">
-                <!-- <rect x="0" y="0" width="100%" height="100%" fill="none"
-                    :style="{'background-image': 'url(' + section_bckg + ')'}"></rect> -->
-                <image 
-                    width="100%" 
-                    height="225%"
-                    x="0"
-                    y="-60%"
-                    :xlink:href="section_bckg"></image>
-                <rect x="0" y="0" width="100%" height="100%" fill="#000000" fill-opacity="0.6"></rect>
-            </g>
-        </svg>
-
-        <div class="curved-content">
-            <h2>{{ section_title }}</h2>
-            <p>
-                {{ section_text }}
-            </p>
-            <a :href="section_button.url" class="button is-primary">
-                <span>{{ section_button.name }}</span>
-            </a>
-        </div>
-
-        <div class="img-bckg" :style="{'background-image': 'url(' + section_bckg + ')'}">
-            <!-- <img :src="section_bckg" alt=""> -->
-        </div>
-    </section>
-</template>
-
-<script>
-
-export default {
-    props: ['section_title', 'section_bckg', 'section_text', 'section_button'],
-
-    data: function () {
-        return {
-            
-        }
-    },
-    methods: {
-        
-    },
-    computed: {
-        
-    },
-    mounted: function () {
-        
-    }
-}
-</script>
diff --git a/website/components/Events.vue b/website/components/Events.vue
deleted file mode 100644
index 81022ea..0000000
--- a/website/components/Events.vue
+++ /dev/null
@@ -1,91 +0,0 @@
-<template>
-    <section class="section element-loader loading is-relative">
-        <div class="container is-relative z10">
-            <h2 class="mb25 has-text-centered" v-if="project_title">{{ project_title }}</h2>
-
-            <div class="is-relative">
-                <div 
-                    :class="[
-                        'columns', 'flex-wrap', 'align-center', 'is-relative', 'z10',
-                        {'element-loader': loading, 'loading': loading, }
-                    ]">
-                    <div class="column is-3-tablet is-6-mobile p15" 
-                        v-if="i > (start_from - 1)"
-                        v-for="(post, i) in posts">
-                        <a :href="post.link" class="event-holder" target="_blank">
-                            <img :src="post.images.standard_resolution.url" :alt="post.caption.text">
-                        </a>
-                    </div>
-                </div>
-
-                <div class="illus purple-dots smaller flipped-x z20" v-if="has_illus"></div>
-            </div>
-
-            <div class="is-flex justify-space-between flex-wrap mt30 justify-center-mobile" v-if="pagination">
-                <a href="javascript:;" class="button is-primary is-outlined mb10t" @click="prevFeed()">
-                    <span>Prev</span>
-                </a>
-                <a href="javascript:;" class="button is-primary" @click="nextFeed()">
-                    <span>Next</span>
-                </a>
-            </div>
-        </div>
-
-        <div class="illus green-donut" v-if="has_illus"></div>
-    </section>
-</template>
-
-<script>
-
-import jsonp from 'browser-jsonp'
-
-export default {
-    props: ['project_title', 'count', 'from', 'pagination', 'has_illus'],  
-
-    data: function () {
-        return {
-            start_from: 0,
-            token: '3540941447.1677ed0.9a3438e47d2b4c2585d67633c766c497',
-            url: 'https://api.instagram.com/v1/users/self/media/recent',
-            next_url: '',
-            prev_url: [],
-            posts: [],
-            loading: false
-        }
-    },
-    methods: {
-        prevFeed: function () {
-            this.getUserFeed(this.prev_url[this.prev_url.length - 2])
-            this.prev_url.pop()
-            this.prev_url.pop()
-        },
-        nextFeed: function () {
-            if (this.start_from) this.start_from = 0
-            this.getUserFeed(this.next_url)
-        },
-        getUserFeed (url) {
-            this.loading = true
-            jsonp({
-                url: (url ? url : this.url),
-                data: { access_token: this.token, count: this.start_from ? (this.count + this.start_from) : this.count},
-                error: error => { throw error },
-                complete: response => {
-                    this.posts = response.data
-                    this.prev_url.push(url ? url : this.url)
-                    this.next_url = response.pagination.next_url
-
-                    this.loading = false
-                }
-            })
-        }
-    },
-    computed: {
-        
-    },
-    mounted: function () {
-        if (this.from) this.start_from = this.from
-        
-        this.getUserFeed()
-    }
-}
-</script>
diff --git a/website/components/FilterBox.vue b/website/components/FilterBox.vue
deleted file mode 100644
index e7e201f..0000000
--- a/website/components/FilterBox.vue
+++ /dev/null
@@ -1,37 +0,0 @@
-<template>
-    <section class="section is-medium element-loader loading">
-        <div class="container">
-            <div class="box p30">
-                <div class="is-flex">
-                    <div class="is-flex pl15 pr15" v-for="filter in filters">
-                        <p>{{ filter.label }}</p>
-                        <select name="" id="" class="select-input">
-                            <option :value="option.value" v-for="option in filter.options">{{ option.name }}</option>
-                        </select>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </section>
-</template>
-<script>
-
-export default {
-    props: ['filters'],
-
-    data: function () {
-        return {
-            
-        }
-    },
-    methods: {
-        
-    },
-    computed: {
-        
-    },
-    mounted: function () {
-        
-    }
-}
-</script>
diff --git a/website/components/FlashMessages.vue b/website/components/FlashMessages.vue
deleted file mode 100644
index e69de29..0000000
diff --git a/website/components/Hero.vue b/website/components/Hero.vue
index 2f5e5ce..4f3042a 100644
--- a/website/components/Hero.vue
+++ b/website/components/Hero.vue
@@ -7,12 +7,12 @@
                 {'is-7': !is_carousel},
             ]">
                 
-                <div class="img-bckg is-browser-ie" 
+                <!-- <div class="img-bckg is-browser-ie" 
                     :style="{'background-image': 'url(' + slide.img + ')'}"
                     v-for="(slide, i) in slides" 
-                    :key="'img' + i"></div>
+                    :key="'img' + i"></div> -->
                 
-                <div class="is-hidden-desktop" 
+                <!-- <div class="is-hidden-desktop" 
                 v-for="(slide, i) in slides" 
                 :key="'img' + i">
                     <img :src="slide.img" alt="slide.title">
@@ -20,7 +20,7 @@
                 <div class="img-bckg static is-Ax200-t" 
                     :style="{'background-image': 'url(' + slide.img + ')'}"
                     v-for="(slide, i) in slides" 
-                    :key="'img' + i"></div>
+                    :key="'img' + i"></div> -->
                 
                 <svg class="hero-svg is-not-browser-ie is-hidden-touch" viewBox="0 0 772 606" preserveAspectRatio="xMaxYMax meet">
                     <defs>
@@ -31,10 +31,10 @@
                     </clipPath>
                     <g style="clip-path:url(#clip);">
                         <image  
-                            width="130%" 
-                            height="110%"
+                            width="120%" 
+                            height="100%"
                             x="-10%"
-                            :xlink:href="slide.img" 
+                            xlink:href="~/assets/images/hero.png" 
                             v-for="(slide, i) in slides" 
                             :key="'img' + i"></image>
                         <rect x="0" y="0" width="100%" height="100%" fill="#646464" fill-opacity="0.15"></rect>
diff --git a/website/components/Logo.vue b/website/components/Logo.vue
deleted file mode 100644
index 6c72854..0000000
--- a/website/components/Logo.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <div class="VueToNuxtLogo">
-    <div class="Triangle Triangle--two" />
-    <div class="Triangle Triangle--one" />
-    <div class="Triangle Triangle--three" />
-    <div class="Triangle Triangle--four" />
-  </div>
-</template>
-
-<style>
-.VueToNuxtLogo {
-  display: inline-block;
-  animation: turn 2s linear forwards 1s;
-  transform: rotateX(180deg);
-  position: relative;
-  overflow: hidden;
-  height: 180px;
-  width: 245px;
-}
-
-.Triangle {
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: 0;
-  height: 0;
-}
-
-.Triangle--one {
-  border-left: 105px solid transparent;
-  border-right: 105px solid transparent;
-  border-bottom: 180px solid #41b883;
-}
-
-.Triangle--two {
-  top: 30px;
-  left: 35px;
-  animation: goright 0.5s linear forwards 3.5s;
-  border-left: 87.5px solid transparent;
-  border-right: 87.5px solid transparent;
-  border-bottom: 150px solid #3b8070;
-}
-
-.Triangle--three {
-  top: 60px;
-  left: 35px;
-  animation: goright 0.5s linear forwards 3.5s;
-  border-left: 70px solid transparent;
-  border-right: 70px solid transparent;
-  border-bottom: 120px solid #35495e;
-}
-
-.Triangle--four {
-  top: 120px;
-  left: 70px;
-  animation: godown 0.5s linear forwards 3s;
-  border-left: 35px solid transparent;
-  border-right: 35px solid transparent;
-  border-bottom: 60px solid #fff;
-}
-
-@keyframes turn {
-  100% {
-    transform: rotateX(0deg);
-  }
-}
-
-@keyframes godown {
-  100% {
-    top: 180px;
-  }
-}
-
-@keyframes goright {
-  100% {
-    left: 70px;
-  }
-}
-</style>
diff --git a/website/components/LogosCarousel.vue b/website/components/LogosCarousel.vue
deleted file mode 100644
index 4d882a8..0000000
--- a/website/components/LogosCarousel.vue
+++ /dev/null
@@ -1,54 +0,0 @@
-<template>
-    <section class="section partners-carousel element-loader loading">
-        <div class="container">
-            <h2 class="has-text-centered mb30">{{ section_title }}</h2>
-
-            <carousel
-                :per-page="per_page"
-                :scroll-per-page="false"
-                :navigation-enabled="false"
-                :pagination-enabled="false"
-                :autoplay="true"
-                :loop="true"
-                :min-swipe-distance="300">
-                
-                <slide v-for="(partner, i) in partners" :key="'slide' + i" v-if="partners.length > 0">
-                    <a :href="partner.info.link" :title="partner.name" class="partner-slide" target="_blank">
-                        <img :src="partner.imagesFolder+partner.info.logo" :alt="partner.name">
-                    </a>
-                </slide>
-            </carousel>
-        </div>
-    </section>
-</template>
-
-<script>
-
-import VueCarousel from 'vue-carousel'
-
-Vue.use(VueCarousel)
-
-export default {
-    props: ['section_title', 'slides'],
-
-    data: function () {
-        return {
-            partners: [],
-            per_page: 4
-        }
-    },
-    methods: {
-        
-    },
-    computed: {
-        
-    },
-    mounted: function () {
-        this.partners = this.slides ? this.slides : []
-        
-        if (window.matchMedia("(max-width: 480px)").matches) {
-            this.per_page = 2
-        }
-    }
-}
-</script>
diff --git a/website/components/Positions.vue b/website/components/Positions.vue
deleted file mode 100644
index 7405dad..0000000
--- a/website/components/Positions.vue
+++ /dev/null
@@ -1,61 +0,0 @@
-<template>
-    <section class="section pt60 pt30t pb10 pb30t element-loader loading">
-        <div class="container">
-            <h2 class="mb25 has-text-centered">{{ title }}</h2>
-            
-            <div class="box position" v-for="(pos, i) in positions">
-                <a href="javascript:;" class="is-flex align-center has-text-dark" @click="expand(i)">
-                    <div class="icon-holder is-relative">
-                        <i :class="
-                            ['mdi', 'mdi-plus', 'is-size-1', 'has-text-primary', 'm0-20', 'ml0t', 'mr10t',
-                            {'is-not-visible': expands[i]}]
-                        "></i>
-                        <i :class="
-                            ['mdi', 'mdi-minus', 'is-size-1', 'has-text-primary', 'm0-20', 'ml0t', 'mr10t', 'is-absolute', 't0',
-                            {'is-not-visible': !expands[i]}]
-                        "></i>
-                    </div>
-                    <h4>
-                        {{ pos.info.title }}
-                    </h4>
-                </a>
-                <div v-if="expands[i]" class="pl80 pl0t mt20">
-                    <div v-html="pos.info.desc"></div>
-                    <a :href="pos.info.link" class="button is-primary m30-0" target="_blank">
-                        <span>Apply now</span>
-                    </a>
-                </div>
-            </div>
-        </div>
-    </section>
-</template>
-
-<script>
-
-export default {
-    props: ['title', 'positions'],
-
-    data: function () {
-        return {
-            expands: [],
-            opa: 'opaa'
-        }
-    },
-    methods: {
-        expand: function (i) {
-            Vue.set(this.expands, i, !this.expands[i])
-        },
-        toggleOpa: function (ops) {
-            this.opa = ops
-        }
-    },
-    computed: {
-        
-    },
-    mounted: function () {
-        for (let i = 0; i < this.positions.length; i++) {
-            this.expands.push(false)
-        }
-    }
-}
-</script>
diff --git a/website/components/Stories.vue b/website/components/Stories.vue
deleted file mode 100644
index 8cf7b3d..0000000
--- a/website/components/Stories.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-    <section class="section is-relative element-loader loading">
-        <div class="container is-relative z10">
-            <h2 class="has-text-centered mb25" v-if="section_title">{{ section_title }}</h2>
-            <div class="columns flex-wrap">
-                <div class="column is-4-desktop is-4-tablet is-12-mobile pb30 pb10t" v-for="(story, i) in stories">
-                    <a :href="story.url" class="box story m0t">
-                        <figure class="img-holder is-Ax240 is-Ax120-t has-rounded-corners" v-if="story.img">
-                            <img :src="story.img" :alt="story.title">
-                        </figure>
-                        <div v-else><br></div>
-                        <h4 v-line-clamp="{ 
-                            lines: 4,
-                            text: story.title
-                        }">
-                        </h4>
-                        <div class="is-flex">
-                            <p class="date">
-                                {{ story.date }}
-                            </p>
-                            <p v-line-clamp="{ 
-                                lines: 6,
-                                text: story.desc
-                            }">
-                            </p>
-                        </div>
-                    </a>
-                </div>
-            </div>
-            <div class="has-text-centered mt30" v-if="section_button">
-                <a :href="section_button.url" class="button is-primary">
-                    <span>{{ section_button.name }}</span>
-                </a>
-            </div>
-        </div>
-
-        <div class="illus green-egg"></div>
-        <div class="illus purple-circle"></div>
-    </section>
-</template>
-
-<script>
-
-var lineClamp = require('vue-line-clamp-extended').lineClamp
-Vue.directive('line-clamp', lineClamp)
-
-export default {
-    props: ['section_title', 'section_button', 'stories'],
-
-    data: function () {
-        return {
-            
-        }
-    },
-    methods: {
-        
-    },
-    computed: {
-        
-    }
-}
-</script>
diff --git a/website/layouts/default.vue b/website/layouts/default.vue
index 7403843..ad71b7e 100644
--- a/website/layouts/default.vue
+++ b/website/layouts/default.vue
@@ -39,11 +39,7 @@
                 {
                     name: 'Home',
                     url: '/'
-                },
-                {
-                    name: 'Contact us',
-                    url: '/'
-                },
+                }
             ]"
         ></abs-footer>
 
diff --git a/website/nuxt.config.js b/website/nuxt.config.js
index 48d8df5..c8bbe38 100644
--- a/website/nuxt.config.js
+++ b/website/nuxt.config.js
@@ -16,7 +16,8 @@ module.exports = {
     ],
     link: [
       { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' },
-      { rel: 'stylesheet', type: 'text/css', href: '//cdn.materialdesignicons.com/2.0.46/css/materialdesignicons.min.css' }
+      { rel: 'stylesheet', type: 'text/css', href: '//cdn.materialdesignicons.com/2.0.46/css/materialdesignicons.min.css' },
+      { rel: 'stylesheet', type: 'text/css', href: 'https://fonts.googleapis.com/css?family=Raleway&Open+Sans' }
     ]
   },
 
diff --git a/website/package-lock.json b/website/package-lock.json
index ce17c36..3a1ae8b 100644
--- a/website/package-lock.json
+++ b/website/package-lock.json
@@ -4434,8 +4434,7 @@
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4453,13 +4452,11 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
-          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -4472,18 +4469,15 @@
         },
         "code-point-at": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -4586,8 +4580,7 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "ini": {
           "version": "1.3.5",
@@ -4597,7 +4590,6 @@
         "is-fullwidth-code-point": {
           "version": "1.0.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -4610,20 +4602,17 @@
         "minimatch": {
           "version": "3.0.4",
           "bundled": true,
-          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "minipass": {
           "version": "2.3.5",
           "bundled": true,
-          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -4640,7 +4629,6 @@
         "mkdirp": {
           "version": "0.5.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -4713,8 +4701,7 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -4724,7 +4711,6 @@
         "once": {
           "version": "1.4.0",
           "bundled": true,
-          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -4800,8 +4786,7 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4831,7 +4816,6 @@
         "string-width": {
           "version": "1.0.2",
           "bundled": true,
-          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -4849,7 +4833,6 @@
         "strip-ansi": {
           "version": "3.0.1",
           "bundled": true,
-          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4888,13 +4871,11 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         },
         "yallist": {
           "version": "3.0.3",
-          "bundled": true,
-          "optional": true
+          "bundled": true
         }
       }
     },
diff --git a/website/pages/about.vue b/website/pages/about.vue
index feaa7f7..f679fcd 100644
--- a/website/pages/about.vue
+++ b/website/pages/about.vue
@@ -3,6 +3,7 @@
 
         <page-title
             title="About"
+            desc="Some details about Assis10t - the dedicated team behind the Bob!"
         ></page-title>
 
     </div>
diff --git a/website/pages/bob-app.vue b/website/pages/bob-app.vue
index 9ffe3f4..c4804c7 100644
--- a/website/pages/bob-app.vue
+++ b/website/pages/bob-app.vue
@@ -3,6 +3,7 @@
 
         <page-title
             title="Download the Bob App"
+            desc="Information about the App used by Customers to place orders, as well as a link to download it."
         ></page-title>
 
     </div>
diff --git a/website/pages/contacts.vue b/website/pages/contacts.vue
index 517c791..8013169 100644
--- a/website/pages/contacts.vue
+++ b/website/pages/contacts.vue
@@ -3,6 +3,7 @@
 
         <page-title
             title="Contact us"
+            desc="Some contact information..."
         ></page-title>
 
     </div>
diff --git a/website/pages/index.vue b/website/pages/index.vue
index 93a8de0..b71c176 100644
--- a/website/pages/index.vue
+++ b/website/pages/index.vue
@@ -4,6 +4,7 @@
         :slides="[
             {
                 title: 'Meet the Bob',
+                img: '~/assets/images/hero.png',
                 short_description: 'Bob (Brilliant Online Buying) is a shopping assistant robot designed to help you.',
                 
             }
diff --git a/website/pages/login.vue b/website/pages/login.vue
index c8411a6..03882e0 100644
--- a/website/pages/login.vue
+++ b/website/pages/login.vue
@@ -11,15 +11,26 @@
                         <div class="field">
                             <label class="label">Username:</label>
                             <div class="control">
-                                <input class="input" type="text" placeholder="Enter your full name" v-model="username">
+                                <input 
+                                    :class="[
+                                        'input', 'is-' + message.status
+                                    ]" 
+                                    type="text" 
+                                    placeholder="Enter your full name" 
+                                    v-model="username">
                             </div>
+                            <p :class="[
+                                'help', 'is-' + message.status
+                            ]">
+                                {{ message.text }}
+                            </p>
                         </div>
-                        <!-- <div class="field">
+                        <div class="field">
                             <label class="label">Password:</label>
                             <div class="control">
                                 <input class="input" type="password" v-model="password" placeholder="Enter your password">
                             </div>
-                        </div> -->
+                        </div>
                         <!-- <div class="field">
                             <label class="label">Confirm password:</label>
                             <div class="control">
@@ -31,7 +42,7 @@
                                 <a 
                                     href="javascript:;"
                                     class="button is-link" 
-                                    :disabled="!username"
+                                    :disabled="!username || !password"
                                     @click.stop.prevent="login()">
                                     <span>Login</span>
                                 </a>
@@ -58,15 +69,19 @@ export default {
             username: null,
             password: null,
             type: 'merchant',
+            message: {
+                status: null,
+                text: null
+            }
         }
     },
     methods: {
         login () {
-            if (this.username) {
+            if (this.username && this.password) {
                 axios.
                     post('http://localhost:9000/login/', {
                         username: this.username,
-                        // password: this.password,
+                        password: this.password,
                         // type: this.type,
                     }, {
                         headers: {
@@ -80,9 +95,15 @@ export default {
     
                         if (res.status == 200) {
                             this.$router.push('/merchant/orders').go(1)
+                        } else {
+                            this.message.status = 'danger'
+                            this.message.text = 'There is no such username in our database.'
                         }
                     })
-                    .catch(function(error) {
+                    .catch((error) => {
+                        this.message.status = 'danger'
+                        this.message.text = 'There is no such username in our database.'
+
                         console.error("Error adding document: ", error);
                     });
             }
diff --git a/website/pages/meet-bob.vue b/website/pages/meet-bob.vue
index d1872b4..ced7a1f 100644
--- a/website/pages/meet-bob.vue
+++ b/website/pages/meet-bob.vue
@@ -3,6 +3,7 @@
 
         <page-title
             title="Meet the Bob"
+            desc="Information about the idea behind Bob, the shopping assistants main features, pricing and maybe guides on usage."
         ></page-title>
 
     </div>
diff --git a/website/pages/merchant/items/create/_id.vue b/website/pages/merchant/items/create/_id.vue
new file mode 100644
index 0000000..ea30258
--- /dev/null
+++ b/website/pages/merchant/items/create/_id.vue
@@ -0,0 +1,217 @@
+<template>
+    <div>
+        <section class="section pt60 pt30t pb0">
+            <div class="container has-text-centered">
+                <h1 class="is-inline-block is-relative mb25">
+                    Add an item to {{ warehouse.name }}
+                </h1>
+            </div>
+        </section>
+
+        <section class="section">
+            <div class="container is-flex justify-center">
+                <div class="half-width">
+                    <nuxt-link to="/merchant/items" class="is-inline-block mb15">Back to all items</nuxt-link>
+
+                    <div class="box p30 pl50 pr50">
+                        <form action="">
+                            <div class="field">
+                                <label class="label">Item name:</label>
+                                <div class="control">
+                                    <input class="input" type="text" placeholder="Enter item name" v-model="name">
+                                </div>
+                            </div>
+                            <div class="field">
+                                <label class="label">Image:</label>
+                                <div class="control">
+                                    <input class="input" type="file" placeholder="Enter your warehouse name" @change="uploadFile">
+                                </div>
+                                <img class="small-img mt15" :src="image" alt="">
+                            </div>
+                            <div class="field" v-if="warehouse.dimensions">
+                                <label class="label">Position:</label>
+                                <div class="control columns">
+                                    <div class="column is-4">
+                                        <select 
+                                            name="x" 
+                                            id="x" 
+                                            class="input"
+                                            v-model.number="position.x">
+                                            <option 
+                                                :value="n - 1"
+                                                v-for="n in (warehouse.dimensions.x + 1)"
+                                                :key="'x' + n">
+                                                {{ n - 1 }}
+                                            </option>
+                                        </select>
+                                    </div>
+                                    <div class="column is-4">
+                                        <select 
+                                            name="y" 
+                                            id="y" 
+                                            class="input"
+                                            v-model.number="position.y">
+                                            <option 
+                                                :value="n - 1"
+                                                v-for="n in (warehouse.dimensions.y + 1)"
+                                                :key="'y' + n">
+                                                {{ n - 1 }}
+                                            </option>
+                                        </select>
+                                    </div>
+                                    <div class="column is-4">
+                                        <select 
+                                            name="x" 
+                                            id="x" 
+                                            class="input"
+                                            v-model.number="position.z">
+                                            <option 
+                                                :value="n - 1"
+                                                v-for="n in warehouse.dimensions.z.length"
+                                                :key="'z' + n">
+                                                {{ n - 1 }}
+                                            </option>
+                                        </select>
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="field" v-if="warehouse.dimensions">
+                                <div class="control columns">
+                                    <div class="column is-6">
+                                        <label class="label">Quantity:</label>
+                                        <input class="input" type="number" placeholder="Enter item quantity" v-model.number="quantity">
+                                    </div>
+                                    <div class="column is-6">
+                                        <label class="label">Unit:</label>
+                                        <input class="input" type="text" placeholder="Enter measerment unit" v-model="unit">
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="field" v-if="warehouse.dimensions">
+                                <div class="control">
+                                    <label class="label">Price:</label>
+                                    <input class="input" type="number" placeholder="Enter item price" v-model.number="price">
+                                </div>
+                            </div>
+                            
+                            <div class="field">
+                                <div class="control pt30">
+                                    <a 
+                                        href="javascript:;"
+                                        class="button is-link" 
+                                        :disabled="!can_submit"
+                                        @click.stop.prevent="addItem()">
+                                        <span>Add item</span>
+                                    </a>
+                                </div>
+                            </div>
+                        </form>
+                    </div>
+
+                    <nuxt-link to="/merchant/items" class="is-inline-block">Back to all items</nuxt-link>
+                </div>
+            </div>
+        </section>
+    </div>
+</template>
+
+<script>
+import PageTitle from '~/components/PageTitle'
+import axios from 'axios'
+
+export default {
+    components: {
+        PageTitle
+    },
+    data: function () {
+        return {
+            warehouseId: this.$nuxt._route.params.id,
+            warehouse: {},
+
+            name: null,
+            image: null,
+            position: {
+                x: 0,
+                y: 0,
+                z: 0,
+            },
+            quantity: null,
+            unit: null,
+            price: null
+        }
+    },
+    methods: {
+        getWarehouse () {
+            axios.
+                get('http://localhost:9000/warehouse/' + this.warehouseId, {
+                    headers: {
+                        'Content-Type': 'application/json'
+                    }
+                })
+                .then((res) => {
+                    console.log("Server response: ", res);
+                    
+                    this.warehouse = res.data.warehouse
+                })
+                .catch(function(error) {
+                    console.error("Error adding document: ", error);
+                });
+        },
+        uploadFile: function (event) {
+            let file = event.target.files[0]
+            this.createImage(file);
+        },
+        createImage(file) {
+            var image = new Image();
+            var reader = new FileReader();
+
+            reader.onload = (e) => {
+                this.image = e.target.result;
+            };
+
+            reader.readAsDataURL(file);
+        },
+        addItem () {
+            if (this.can_submit) {
+                axios.
+                    post('http://localhost:9000/warehouse/' + this.warehouseId + '/items', {
+                        name: this.name,
+                        image: this.image,
+                        position: this.position,
+                        quantity: this.quantity,
+                        unit: this.unit,
+                        price: this.price,
+                    }, {
+                        headers: {
+                            'Content-Type': 'application/json',
+                            'username': this.$store.state.user.username,
+                        }
+                    })
+                    .then((res) => {
+                        console.log("Server response: ", res);
+    
+                        if (res.status == 200) {
+                            this.$router.push('/merchant/warehouses/' + this.warehouseId).go(1)
+                        }
+                    })
+                    .catch(function(error) {
+                        console.error("Error adding document: ", error);
+                    });
+            }
+        }
+    },
+    computed: {
+        can_submit: function () {
+            return this.name && this.quantity && this.price
+        }
+    },
+    mounted: function () {
+        this.getWarehouse()
+    }
+};
+</script>
+
+<style lang="sass" scoped>
+
+
+</style>
diff --git a/website/pages/merchant/items/edit/_id.vue b/website/pages/merchant/items/edit/_id.vue
index ca5044c..37854e4 100644
--- a/website/pages/merchant/items/edit/_id.vue
+++ b/website/pages/merchant/items/edit/_id.vue
@@ -14,11 +14,11 @@
                     <nuxt-link to="/merchant/items" class="is-inline-block mb15">Back to all items</nuxt-link>
 
                     <div class="box p30 pl50 pr50">
-                        <form action="">
+                        <form action="" v-if="item && warehouse">
                             <div class="field">
                                 <label class="label">Item name:</label>
                                 <div class="control">
-                                    <input class="input" type="text" placeholder="Enter item name" v-model="name">
+                                    <input class="input" type="text" placeholder="Enter item name" v-model="item.name">
                                 </div>
                             </div>
                             <div class="field">
@@ -26,7 +26,7 @@
                                 <div class="control">
                                     <input class="input" type="file" placeholder="Enter your warehouse name" @change="uploadFile">
                                 </div>
-                                <img class="small-img mt15" :src="image" alt="">
+                                <img class="small-img mt15" :src="item.image" alt="">
                             </div>
                             <div class="field" v-if="warehouse.dimensions">
                                 <label class="label">Position:</label>
@@ -36,7 +36,7 @@
                                             name="x" 
                                             id="x" 
                                             class="input"
-                                            v-model.number="position.x">
+                                            v-model.number="item.position.x">
                                             <option 
                                                 :value="n - 1"
                                                 v-for="n in (warehouse.dimensions.x + 1)">
@@ -49,7 +49,7 @@
                                             name="y" 
                                             id="y" 
                                             class="input"
-                                            v-model.number="position.y">
+                                            v-model.number="item.position.y">
                                             <option 
                                                 :value="n - 1"
                                                 v-for="n in (warehouse.dimensions.y + 1)">
@@ -62,7 +62,7 @@
                                             name="x" 
                                             id="x" 
                                             class="input"
-                                            v-model.number="position.z">
+                                            v-model.number="item.position.z">
                                             <option 
                                                 :value="n - 1"
                                                 v-for="n in warehouse.dimensions.z.length">
@@ -76,18 +76,18 @@
                                 <div class="control columns">
                                     <div class="column is-6">
                                         <label class="label">Quantity:</label>
-                                        <input class="input" type="number" placeholder="Enter item quantity" v-model.number="quantity">
+                                        <input class="input" type="number" placeholder="Enter item quantity" v-model.number="item.quantity">
                                     </div>
                                     <div class="column is-6">
                                         <label class="label">Unit:</label>
-                                        <input class="input" type="text" placeholder="Enter measerment unit" v-model="unit">
+                                        <input class="input" type="text" placeholder="Enter measerment unit" v-model="item.unit">
                                     </div>
                                 </div>
                             </div>
                             <div class="field" v-if="warehouse.dimensions">
                                 <div class="control">
                                     <label class="label">Price:</label>
-                                    <input class="input" type="number" placeholder="Enter item price" v-model.number="price">
+                                    <input class="input" type="number" placeholder="Enter item price" v-model.number="item.price">
                                 </div>
                             </div>
                             
@@ -96,13 +96,15 @@
                                     <a 
                                         href="javascript:;"
                                         class="button is-link" 
-                                        :disabled="!can_submit"
-                                        @click.stop.prevent="addItem()">
-                                        <span>Add item</span>
+                                        @click.stop.prevent="updateItem()">
+                                        <span>Update item</span>
                                     </a>
                                 </div>
                             </div>
                         </form>
+                        <h3 class="has-text-centered m30-0" v-else>
+                            Loading...
+                        </h3>
                     </div>
 
                     <nuxt-link to="/merchant/items" class="is-inline-block">Back to all items</nuxt-link>
@@ -122,8 +124,10 @@ export default {
     },
     data: function () {
         return {
-            itemId: this.$nuxt._route.params.id,
-            item: {}
+            warehouseId: this.$nuxt._route.params.id.split('_')[0],
+            itemId: this.$nuxt._route.params.id.split('_')[1],
+            item: null,
+            warehouse: null
         }
     },
     methods: {
@@ -143,6 +147,23 @@ export default {
                     console.error("Error adding document: ", error);
                 });
         },
+        getItem () {
+            axios.
+                get('http://localhost:9000/warehouse/' + this.warehouseId + '/items/' + this.itemId, {
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'username': this.$store.state.user.username,
+                    }
+                })
+                .then((res) => {
+                    console.log("Server response: ", res);
+                    
+                    this.item = res.data.item
+                })
+                .catch(function(error) {
+                    console.error("Error adding document: ", error);
+                });
+        },
         uploadFile: function (event) {
             let file = event.target.files[0]
             this.createImage(file);
@@ -152,38 +173,29 @@ export default {
             var reader = new FileReader();
 
             reader.onload = (e) => {
-                this.image = e.target.result;
+                this.item.image = e.target.result;
             };
 
             reader.readAsDataURL(file);
         },
-        addItem () {
-            if (this.can_submit) {
-                axios.
-                    post('http://localhost:9000/warehouse/' + this.warehouseId + '/items', {
-                        name: this.name,
-                        image: this.image,
-                        position: this.position,
-                        quantity: this.quantity,
-                        unit: this.unit,
-                        price: this.price,
-                    }, {
-                        headers: {
-                            'Content-Type': 'application/json',
-                            'username': this.$store.state.user.username,
-                        }
-                    })
-                    .then((res) => {
-                        console.log("Server response: ", res);
-    
-                        if (res.status == 200) {
-                            this.$router.push('/merchant/warehouses/' + this.warehouseId).go(1)
-                        }
-                    })
-                    .catch(function(error) {
-                        console.error("Error adding document: ", error);
-                    });
-            }
+        updateItem () {
+            axios.
+                post('http://localhost:9000/warehouse/' + this.warehouseId + '/items', this.item, {
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'username': this.$store.state.user.username,
+                    }
+                })
+                .then((res) => {
+                    console.log("Server response: ", res);
+
+                    if (res.status == 200) {
+                        this.$router.push('/merchant/items').go(1)
+                    }
+                })
+                .catch(function(error) {
+                    console.error("Error adding document: ", error);
+                });
         }
     },
     computed: {
@@ -193,6 +205,7 @@ export default {
     },
     mounted: function () {
         this.getWarehouse()
+        this.getItem()
     }
 };
 </script>
diff --git a/website/pages/merchant/items/index.vue b/website/pages/merchant/items/index.vue
index 87db60a..f7b7391 100644
--- a/website/pages/merchant/items/index.vue
+++ b/website/pages/merchant/items/index.vue
@@ -5,14 +5,15 @@
             <div class="container has-text-centered">
                 <h1 class="is-inline-block is-relative mb25">
                     All items in 
-                    <label class="transparent-label" @click="triggerSelect()">
+                    <label class="transparent-label" @click="triggerSelect()" v-if="selectedWarehouse">
                         {{ selectedWarehouse ? selectedWarehouse.name : 'loading...' }} <i class="mdi mdi-chevron-down"></i>
                     </label>
                     <select 
                         class="transparent-select" 
                         name="warehouse" 
                         v-model="selectedWarehouse"
-                        @change="getItems(selectedWarehouse._id)">
+                        @change="getItems(selectedWarehouse._id)"
+                        v-if="selectedWarehouse">
                         <option :value="warehouse" v-for="warehouse in warehouses" :key="warehouse._id" :selected="warehouse._id == selectedWarehouse._id">
                             {{ warehouse.name }}
                         </option>
@@ -26,13 +27,14 @@
                 <div class="is-flex justify-end">
                     <nuxt-link 
                         :to="'/merchant/items/create/' + (selectedWarehouse ? selectedWarehouse._id : '')" 
-                        class="button is-link mb15">
+                        class="button is-link mb15"
+                        v-if="selectedWarehouse">
                         <span>Add an item to this warehouse</span>
                     </nuxt-link>
                 </div>
 
                 <div class="box is-full-width">
-                    <table class="table is-full-width">
+                    <table class="table is-full-width" v-if="selectedWarehouse && items.length > 0">
                         <thead>
                             <tr>
                                 <td>Name</td>
@@ -46,7 +48,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr v-for="item in items" :key="item._id">
+                            <tr v-for="(item, i) in items" :key="item._id">
                                 <td>
                                     <b>{{ item.name }}</b>
                                 </td>
@@ -69,13 +71,13 @@
                                 </td>
 
                                 <td>
-                                    <a href="#" class="has-text-success">
+                                    <nuxt-link :to="'/merchant/items/edit/' + selectedWarehouse._id + '_' + item._id" class="has-text-success">
                                         <i class="mdi mdi-pencil"></i>
                                         Edit
-                                    </a>
+                                    </nuxt-link>
                                 </td>
                                 <td>
-                                    <a href="#" class="has-text-danger">
+                                    <a href="javascript:;" class="has-text-danger" @click="deleteItem(selectedWarehouse._id, item._id, i)">
                                         <i class="mdi mdi-delete"></i>
                                         Delete
                                     </a>
@@ -83,6 +85,12 @@
                             </tr>
                         </tbody>
                     </table>
+                    <h3 class="has-text-centered m30-0" v-else-if="!selectedWarehouse">
+                        You haven't added any warehouses.
+                    </h3>
+                    <h3 class="has-text-centered m30-0" v-else>
+                        You haven't added any items.
+                    </h3>
                 </div>
             </div>
         </section>
@@ -152,6 +160,24 @@ export default {
                     console.error("Error adding document: ", error);
                 });
         },
+        deleteItem: function (warehouseId, itemId, i) {
+            axios.
+                delete(
+                    'http://localhost:9000/warehouse/' + warehouseId + '/items/' + itemId, {
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'username': this.$store.state.user.username,
+                    }
+                })
+                .then((res) => {
+                    console.log("Server response: ", res);
+                    
+                    this.items.splice(i, 1)
+                })
+                .catch(function(error) {
+                    console.error("Error adding document: ", error);
+                });
+        }
     },
     mounted: function () {
         this.getWarehouses()
diff --git a/website/pages/merchant/orders.vue b/website/pages/merchant/orders.vue
index d881030..cedd00d 100644
--- a/website/pages/merchant/orders.vue
+++ b/website/pages/merchant/orders.vue
@@ -5,14 +5,15 @@
             <div class="container has-text-centered">
                 <h1 class="is-inline-block is-relative mb25">
                     All orders in 
-                    <label class="transparent-label" @click="triggerSelect()">
+                    <label class="transparent-label" @click="triggerSelect()"  v-if="selectedWarehouse">
                         {{ selectedWarehouse ? selectedWarehouse.name : 'loading...' }} <i class="mdi mdi-chevron-down"></i>
                     </label>
                     <select 
                         class="transparent-select" 
                         name="warehouse" 
                         v-model="selectedWarehouse"
-                        @change="getOrders(selectedWarehouse._id)">
+                        @change="getOrders(selectedWarehouse._id)"
+                        v-if="selectedWarehouse">
                         <option :value="warehouse" v-for="warehouse in warehouses" :key="warehouse._id" :selected="warehouse._id == selectedWarehouse._id">
                             {{ warehouse.name }}
                         </option>
@@ -24,7 +25,7 @@
         <section class="section">
             <div class="container">
                 <div class="box is-full-width">
-                    <table class="table is-full-width">
+                    <table class="table is-full-width" v-if="selectedWarehouse && orders.length > 0">
                         <thead>
                             <tr>
                                 <td>Items</td>
@@ -55,6 +56,12 @@
                             </tr>
                         </tbody>
                     </table>
+                    <h3 class="has-text-centered m30-0" v-else-if="!selectedWarehouse">
+                        You haven't added any warehouses.
+                    </h3>
+                    <h3 class="has-text-centered m30-0" v-else>
+                        No orders have been placed.
+                    </h3>
                 </div>
             </div>
         </section>
diff --git a/website/pages/merchant/warehouses/_id.vue b/website/pages/merchant/warehouses/_id.vue
index 562ffb9..0f0940d 100644
--- a/website/pages/merchant/warehouses/_id.vue
+++ b/website/pages/merchant/warehouses/_id.vue
@@ -69,7 +69,7 @@
                 <h3 class="has-text-centered mt50 mb20">Orders</h3>
 
                 <div class="box is-full-width">
-                    <table class="table is-full-width">
+                    <table class="table is-full-width" v-if="orders.length > 0">
                         <thead>
                             <tr>
                                 <td>Items</td>
@@ -100,12 +100,15 @@
                             </tr>
                         </tbody>
                     </table>
+                    <h3 class="has-text-centered m30-0" v-else>
+                        No orders have been placed.
+                    </h3>
                 </div>
 
                 <h3 class="has-text-centered mt50 mb20">Items</h3>
 
                 <div class="box is-full-width">
-                    <table class="table is-full-width">
+                    <table class="table is-full-width" v-if="items.length > 0">
                         <thead>
                             <tr>
                                 <td>Name</td>
@@ -119,7 +122,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr v-for="item in items" :key="item._id">
+                            <tr v-for="(item, i) in items" :key="item._id">
                                 <td>
                                     <b>{{ item.name }}</b>
                                 </td>
@@ -142,13 +145,13 @@
                                 </td>
 
                                 <td>
-                                    <a href="#" class="has-text-success">
+                                    <nuxt-link :to="'/merchant/items/edit/' + warehouseId + '_' + item._id" class="has-text-success">
                                         <i class="mdi mdi-pencil"></i>
                                         Edit
-                                    </a>
+                                    </nuxt-link>
                                 </td>
                                 <td>
-                                    <a href="#" class="has-text-danger">
+                                    <a href="javascript:;" class="has-text-danger" @click="deleteItem(warehouseId, item._id, i)">
                                         <i class="mdi mdi-delete"></i>
                                         Delete
                                     </a>
@@ -156,6 +159,9 @@
                             </tr>
                         </tbody>
                     </table>
+                    <h3 class="has-text-centered m30-0" v-else>
+                        You still haven't added any items.
+                    </h3>
                 </div>
                 <div class="is-flex justify-start align-center">
                     <nuxt-link 
@@ -219,6 +225,24 @@ export default {
                 .catch(function(error) {
                     console.error("Error adding document: ", error);
                 });
+        },
+        deleteItem: function (warehouseId, itemId, i) {
+            axios.
+                delete(
+                    'http://localhost:9000/warehouse/' + warehouseId + '/items/' + itemId, {
+                    headers: {
+                        'Content-Type': 'application/json',
+                        'username': this.$store.state.user.username,
+                    }
+                })
+                .then((res) => {
+                    console.log("Server response: ", res);
+                    
+                    this.items.splice(i, 1)
+                })
+                .catch(function(error) {
+                    console.error("Error adding document: ", error);
+                });
         }
     },
     mounted: function () {
diff --git a/website/pages/merchant/warehouses/edit/_id.vue b/website/pages/merchant/warehouses/edit/_id.vue
index eec5e6c..4c87026 100644
--- a/website/pages/merchant/warehouses/edit/_id.vue
+++ b/website/pages/merchant/warehouses/edit/_id.vue
@@ -100,6 +100,9 @@ export default {
         }
     },
     methods: {
+        addShelf: function () {
+            this.warehouse.dimensions.z.push(this.warehouse.dimensions.z[this.warehouse.dimensions.z.length - 1])
+        },
         uploadFile: function (event) {
             let file = event.target.files[0]
             this.createImage(file);
diff --git a/website/pages/merchant/warehouses/index.vue b/website/pages/merchant/warehouses/index.vue
index b6d63ea..dc13324 100644
--- a/website/pages/merchant/warehouses/index.vue
+++ b/website/pages/merchant/warehouses/index.vue
@@ -14,7 +14,7 @@
                     </nuxt-link>
                 </div>
                 <div class="box is-full-width">
-                    <table class="table is-full-width">
+                    <table class="table is-full-width" v-if="warehouses.length > 0">
                         <thead>
                             <tr>
                                 <td>Warehouse name</td>
@@ -28,7 +28,7 @@
                             </tr>
                         </thead>
                         <tbody>
-                            <tr v-for="warehouse in warehouses" :key="warehouse._id">
+                            <tr v-for="(warehouse, i) in warehouses" :key="warehouse._id">
                                 <td>
                                     <b>{{ warehouse.name }}</b>
                                 </td>
@@ -59,7 +59,7 @@
                                     </nuxt-link>
                                 </td>
                                 <td>
-                                    <a href="#" class="has-text-danger">
+                                    <a href="javascript:;" class="has-text-danger" @click="deleteWarehouse(warehouse._id, i)">
                                         <i class="mdi mdi-delete"></i>
                                         Delete
                                     </a>
@@ -67,6 +67,9 @@
                             </tr>
                         </tbody>
                     </table>
+                    <h3 class="has-text-centered m30-0" v-else>
+                        You still haven't added any warehouses.
+                    </h3>
                 </div>
             </div>
         </section>
@@ -104,6 +107,7 @@ export default {
                     console.log("Server response: ", res);
 
                     this.warehouses = this.filterWarehouses(res.data.warehouses)
+                    // this.warehouses = res.data.warehouses
 
                     // if (res.status == 200) {
                     //     this.$router.push('/merchant/orders').go(1)
@@ -112,6 +116,9 @@ export default {
                 .catch(function(error) {
                     console.error("Error adding document: ", error);
                 });
+        },
+        deleteWarehouse: function (warehouseId, i) {
+            this.warehouses.splice(i, 1)
         }
     },
     mounted: function () {
diff --git a/website/pages/register.vue b/website/pages/register.vue
index 0a9d376..174eeb1 100644
--- a/website/pages/register.vue
+++ b/website/pages/register.vue
@@ -25,12 +25,12 @@
                                 {{ message.text }}
                             </p>
                         </div>
-                        <!-- <div class="field">
+                        <div class="field">
                             <label class="label">Password:</label>
                             <div class="control">
                                 <input class="input" type="password" v-model="password" placeholder="Enter your password">
                             </div>
-                        </div> -->
+                        </div>
                         <!-- <div class="field">
                             <label class="label">Confirm password:</label>
                             <div class="control">
@@ -42,7 +42,7 @@
                                 <a 
                                     href="javascript:;"
                                     class="button is-link" 
-                                    :disabled="!username"
+                                    :disabled="!username || !password"
                                     @click.stop.prevent="register()">
                                     <span>Sign up</span>
                                 </a>
@@ -77,7 +77,7 @@ export default {
     },
     methods: {
         register () {
-            if (this.username) {
+            if (this.username && this.password) {
                 axios.
                     post('http://localhost:9000/register/', {
                         username: this.username,
@@ -96,7 +96,7 @@ export default {
                         this.message.status = res.status == 200 ? 'success' : 'danger'
                         this.message.text = 'You have successfully created your account!'
 
-                        if (this.message.status == 200) {
+                        if (res.status == 200) {
                             this.$router.push('/merchant/orders').go(1)
                         }
                     })