diff --git a/.eslintignore b/.eslintignore
index 597f2d8a1..b512c09d4 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -1,2 +1 @@
-node_modules
-services/nginx/*
\ No newline at end of file
+node_modules
\ No newline at end of file
diff --git a/README.md b/README.md
index ab7cf3f36..a3394cc84 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,6 @@ Required applications.
 
 * Visual Studio Code
 * Node.js = 8.15.0
-* NGINX
 * Docker
 
 In Visual Studio Code we use the ESLint extension. Open Visual Studio Code, press Ctrl+P and paste the following command.
@@ -44,12 +43,6 @@ Launch application in developer environment.
 $ gulp
 ```
 
-Also you can run backend and frontend as separately gulp tasks (including NGINX).
-```
-$ gulp front
-$ gulp back
-```
-
 Manually reset fixtures.
 ```
 $ gulp docker
diff --git a/back/model-config.json b/back/model-config.json
index fa412618d..f69b9d7d0 100644
--- a/back/model-config.json
+++ b/back/model-config.json
@@ -11,6 +11,9 @@
     "Company": {
         "dataSource": "vn"
     },
+    "Delivery": {
+        "dataSource": "vn"
+    },
     "Message": {
         "dataSource": "vn"
     },
@@ -46,6 +49,12 @@
     },
     "PersonDepartment": {
         "dataSource": "vn"
+    },
+    "Route": {
+        "dataSource": "vn"
+    },
+    "Vehicle": {
+        "dataSource": "vn"
     }
 }
 
diff --git a/modules/route/back/models/delivery.json b/back/models/delivery.json
similarity index 100%
rename from modules/route/back/models/delivery.json
rename to back/models/delivery.json
diff --git a/modules/route/back/models/route.json b/back/models/route.json
similarity index 100%
rename from modules/route/back/models/route.json
rename to back/models/route.json
diff --git a/modules/route/back/models/vehicle.json b/back/models/vehicle.json
similarity index 100%
rename from modules/route/back/models/vehicle.json
rename to back/models/vehicle.json
diff --git a/front/core/components/treeview/child.html b/front/core/components/treeview/child.html
index 2b3f1e60f..437e7ca7d 100644
--- a/front/core/components/treeview/child.html
+++ b/front/core/components/treeview/child.html
@@ -1,5 +1,5 @@
 <ul ng-if="$ctrl.items">
-    <li ng-repeat="item in $ctrl.items" ng-class="{'selected' : item.selected, 'included': item.included}">
+    <li ng-repeat="item in $ctrl.items" ng-class="{'selected' : item.selected && !item.excluded, 'included': item.included}">
         <vn-horizontal>
             <vn-auto class="actions">
                 <vn-icon icon="keyboard_arrow_up" ng-if="item.childs.length" 
@@ -11,7 +11,7 @@
             </vn-auto>
             <vn-one class="description">
                 <vn-horizontal>
-                    <vn-check vn-auto field="item.selected" 
+                    <vn-check vn-auto field="item.selected && !item.excluded" 
                         on-change="$ctrl.select(item)">
                     </vn-check>
                     <vn-one ng-dblclick="$ctrl.toggle(item)" class="text unselectable">
diff --git a/front/core/components/treeview/index.js b/front/core/components/treeview/index.js
index 69cbb4f26..6449ec450 100644
--- a/front/core/components/treeview/index.js
+++ b/front/core/components/treeview/index.js
@@ -74,7 +74,7 @@ export default class Treeview extends Component {
         for (let i = 0; i < childs.length; i++) {
             childs[i].included = false;
 
-            if ((node.selected || node.included && this.hasCheckedParents(childs[i])) && !childs[i].selected)
+            if (((node.selected || node.included && this.hasCheckedParents(childs[i])) && !childs[i].selected) && !node.excluded)
                 childs[i].included = true;
 
             this.repaintDesc(childs[i]);
@@ -107,6 +107,13 @@ export default class Treeview extends Component {
     }
 
     onSelection(item) {
+        let canBeExcluded = this.hasCheckedChilds(item) || this.hasCheckedParents(item);
+
+        if (!item.selected && item.included && canBeExcluded)
+            item.excluded = true;
+        else
+            item.excluded = false;
+
         item.selected = !item.selected;
 
         if (item.selected && item.included)
diff --git a/front/module-import.js b/front/module-import.js
index 8929b5fda..575787ee8 100755
--- a/front/module-import.js
+++ b/front/module-import.js
@@ -1,7 +1,18 @@
 
 export default function moduleImport(moduleName) {
-    return import(
-        /* webpackInclude: /modules\/[a-z0-9-]+\/front\/index.js$/ */
-        `../modules/${moduleName}/front/index.js`
-    );
-}
\ No newline at end of file
+    // FIXME: Webpack watches module backend files when using dynamic import
+    //return import(
+    //    /* webpackInclude: /modules\/[a-z0-9-]+\/front\/index.js$/ */
+    //    '../modules/'+ moduleName +'/front/index.js'
+    //);
+
+    switch(moduleName) {
+    case 'client' : return import('client/front');
+    case 'item'   : return import('item/front');
+    case 'ticket' : return import('ticket/front');
+    case 'order'  : return import('order/front');
+    case 'claim'  : return import('claim/front');
+    case 'agency' : return import('agency/front');
+    case 'travel' : return import('travel/front');
+    }
+}
diff --git a/gulpfile.js b/gulpfile.js
index e3bd4dda3..f100e66ad 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -42,10 +42,13 @@ backOnly.description = `Starts backend service`;
 
 function backWatch(done) {
     const nodemon = require('gulp-nodemon');
-    let sleepBin = isWindows ? 'timeout' : 'sleep';
+
+    // XXX: Workaround to avoid nodemon bug
+    // https://github.com/remy/nodemon/issues/1346
+    let sleepBin = isWindows ? '' : 'sleep 1 &&';
 
     nodemon({
-        exec: `${sleepBin} 1 && node --inspect ./node_modules/gulp/bin/gulp.js`,
+        exec: `${sleepBin} node --inspect ./node_modules/gulp/bin/gulp.js`,
         args: ['backOnly'],
         watch: backSources,
         done: done
diff --git a/modules/agency/back/methods/zone-included/toggleIsIncluded.js b/modules/agency/back/methods/zone-included/toggleIsIncluded.js
index dd9e89d28..766c51835 100644
--- a/modules/agency/back/methods/zone-included/toggleIsIncluded.js
+++ b/modules/agency/back/methods/zone-included/toggleIsIncluded.js
@@ -23,13 +23,30 @@ module.exports = Self => {
     });
 
     Self.toggleIsIncluded = async(zoneFk, geoFk) => {
+        const models = Self.app.models;
+        const geo = await models.ZoneTreeview.findById(geoFk);
         const isIncluded = await Self.findOne({
             where: {zoneFk, geoFk}
         });
 
+        const hasCheckedParents = await Self.rawSql(
+            `SELECT id
+                FROM vn.zoneTreeview zt 
+                    JOIN vn.zoneIncluded zi ON zi.geoFk = zt.id
+                WHERE zt.lft < ? AND zt.rgt > ?`, [geo.lft, geo.rgt]
+        );
+        const hasCheckedChilds = await Self.rawSql(
+            `SELECT id
+                FROM vn.zoneTreeview zt 
+                    JOIN vn.zoneIncluded zi ON zi.geoFk = zt.id
+                WHERE zt.lft > ? AND zt.rgt < ?`, [geo.lft, geo.rgt]
+        );
+
+        const isExcluded = hasCheckedParents.length || hasCheckedChilds.length;
+
         if (isIncluded)
             return Self.destroyAll({zoneFk, geoFk});
         else
-            return Self.upsert({zoneFk, geoFk});
+            return Self.upsert({zoneFk, geoFk, isIncluded: isExcluded});
     };
 };
diff --git a/modules/agency/back/methods/zone-treeview/getLeaves.js b/modules/agency/back/methods/zone-treeview/getLeaves.js
index 06a878411..08774aa6c 100644
--- a/modules/agency/back/methods/zone-treeview/getLeaves.js
+++ b/modules/agency/back/methods/zone-treeview/getLeaves.js
@@ -78,7 +78,8 @@ module.exports = Self => {
                     pt.depth, 
                     pt.sons,
                     ti.id IS NOT NULL hasCheckedChilds,
-                    zi.geoFk IS NOT NULL AS selected
+                    zi.geoFk IS NOT NULL AS selected,
+                    zi.isIncluded AS excluded
                 FROM zoneTreeview pt
                     LEFT JOIN vn.zoneIncluded zi 
                         ON zi.geoFk = pt.id AND zi.zoneFk = ?
diff --git a/modules/agency/front/summary/index.html b/modules/agency/front/summary/index.html
index 9d4ad04e8..ea565b21b 100644
--- a/modules/agency/front/summary/index.html
+++ b/modules/agency/front/summary/index.html
@@ -1,8 +1,6 @@
 <vn-card class="summary">
+    <h5>{{$ctrl.summary.name}}</h5>
     <vn-vertical pad-medium>
-        <vn-auto>
-            <h5 text-center pad-small-v class="title">{{$ctrl.summary.name}}</h5>
-        </vn-auto>
         <vn-horizontal pad-medium>
             <vn-one>    
                 <vn-label-value label="Id" 
diff --git a/modules/claim/front/descriptor/index.js b/modules/claim/front/descriptor/index.js
index ac53e1203..4ef8a5b77 100644
--- a/modules/claim/front/descriptor/index.js
+++ b/modules/claim/front/descriptor/index.js
@@ -48,10 +48,10 @@ class Controller {
 
     returnDialog(response) {
         if (response === 'CANCEL') {
-            let url = `/report/rpt-claim-pickup-order?claimFk=${this.claim.id}`;
+            let url = `/api/report/rpt-claim-pickup-order?claimFk=${this.claim.id}`;
             window.open(url);
         } else if (response === 'ACCEPT') {
-            this.$http.post(`/email/claim-pickup-order`, {claimFk: this.claim.id}).then(
+            this.$http.post(`/api/email/claim-pickup-order`, {claimFk: this.claim.id}).then(
                 () => this.vnApp.showMessage(this.$translate.instant('Notification sent!'))
             );
         }
diff --git a/modules/client/front/billing-data/index.html b/modules/client/front/billing-data/index.html
index dbda9c3d2..300919acc 100644
--- a/modules/client/front/billing-data/index.html
+++ b/modules/client/front/billing-data/index.html
@@ -39,7 +39,7 @@
                 fields="['name']"
                 initial-data="$ctrl.client.bankEntityFk"
                 on-change="$ctrl.autofillBic()"
-                search-function="{or: [{bic: {regexp: $search}}, {name: {regexp: $search}}]}"
+                search-function="{or: [{bic: {like: $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}"
                 value-field="id"
                 show-field="bic"
                 vn-acl="salesAssistant"
diff --git a/modules/item/front/create/index.html b/modules/item/front/create/index.html
index d2ad459db..544a10848 100644
--- a/modules/item/front/create/index.html
+++ b/modules/item/front/create/index.html
@@ -23,7 +23,7 @@
                     fields="['code', 'name']"
                     value-field="id"
                     field="$ctrl.item.typeFk"
-                    search-function="{or: [{code: {like: '%'+ $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}">
+                    search-function="{or: [{code: {like: $search +'%'}}, {name: {like: '%'+ $search +'%'}}]}">
                     <tpl-item style="display: flex;">
                         <div style="width: 3em; padding-right: 1em;">{{::code}}</div>
                         <div>{{::name}}</div>
@@ -35,7 +35,7 @@
                     show-field="description"
                     value-field="id"
                     field="$ctrl.item.intrastatFk"
-                    search-function="{or: [{id: {like: '%'+ $search +'%'}}, {description: {like: '%'+ $search +'%'}}]}">
+                    search-function="{or: [{id: {like: $search +'%'}}, {description: {like: '%'+ $search +'%'}}]}">
                     <tpl-item style="display: flex;">
                         <div style="width: 6em; text-align: right; padding-right: 1em;">{{::id}}</div>
                         <div>{{::description}}</div>
diff --git a/modules/item/front/data/index.html b/modules/item/front/data/index.html
index ba1f69d0d..329b3d21c 100644
--- a/modules/item/front/data/index.html
+++ b/modules/item/front/data/index.html
@@ -34,7 +34,7 @@
                 show-field="description"
                 value-field="id"
                 field="$ctrl.item.intrastatFk"
-                search-function="{or: [{id: {regexp: $search}}, {description: {regexp: $search}}]}"
+                search-function="{or: [{id: {like: $search +'%'}}, {description: {like: '%'+ $search +'%'}}]}"
                 initial-data="$ctrl.item.intrastat">
                 <tpl-item style="display: flex;">
                     <div style="width: 6em; text-align: right; padding-right: 1em;">{{::id}}</div>
diff --git a/modules/item/front/tags/index.html b/modules/item/front/tags/index.html
index 62962144d..00b606c6a 100644
--- a/modules/item/front/tags/index.html
+++ b/modules/item/front/tags/index.html
@@ -47,7 +47,7 @@
                 ng-show="tag.selection.isFree === false"
                 vn-three
                 url="{{$ctrl.sourceTables[itemTag.id].url}}"
-                search-function="{name: {regexp: $search}}"
+                search-function="{name: {like: '%'+ $search +'%'}}"
                 label="Value"
                 field="itemTag.value"
                 show-field="{{$ctrl.sourceTables[itemTag.id].field}}"
diff --git a/modules/order/front/basic-data/index.html b/modules/order/front/basic-data/index.html
index dea685afd..f52fbfc42 100644
--- a/modules/order/front/basic-data/index.html
+++ b/modules/order/front/basic-data/index.html
@@ -12,7 +12,7 @@
                 vn-one
                 url="/api/Clients"
                 label="Client"
-                search-function="{or: [{id: {regexp: $search}}, {name: {regexp: $search}}]}"
+                search-function="{or: [{id: $search}, {name: {regexp: $search}}]}"
                 show-field="name"
                 value-field="id"
                 field="$ctrl.order.clientFk"
diff --git a/modules/order/front/create/card.html b/modules/order/front/create/card.html
index e3d14bc5a..0b0f8822a 100644
--- a/modules/order/front/create/card.html
+++ b/modules/order/front/create/card.html
@@ -3,7 +3,7 @@
     vn-id="client"
     url="/api/Clients"
     label="Client"
-    search-function="{or: [{id: {regexp: $search}}, {name: {regexp: $search}}]}"
+    search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
     show-field="name"
     value-field="id"
     field="$ctrl.clientFk"
diff --git a/modules/route/back/model-config.json b/modules/route/back/model-config.json
deleted file mode 100644
index 670dd69bf..000000000
--- a/modules/route/back/model-config.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "Delivery": {
-        "dataSource": "vn"
-    },
-    "Route": {
-        "dataSource": "vn"
-    },
-    "Vehicle": {
-        "dataSource": "vn"
-    }
-}
diff --git a/modules/route/front/index.js b/modules/route/front/index.js
deleted file mode 100644
index 20a96c9a5..000000000
--- a/modules/route/front/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export * from './module';
diff --git a/modules/route/front/locale/en.yml b/modules/route/front/locale/en.yml
deleted file mode 100644
index 6659ba5dc..000000000
--- a/modules/route/front/locale/en.yml
+++ /dev/null
@@ -1 +0,0 @@
-Routes: Routes
\ No newline at end of file
diff --git a/modules/route/front/locale/es.yml b/modules/route/front/locale/es.yml
deleted file mode 100644
index 63efa8289..000000000
--- a/modules/route/front/locale/es.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-Routes: Rutas
-List: Listado
-Enter a new search: Introduce una nueva búsqueda
\ No newline at end of file
diff --git a/modules/route/front/module.js b/modules/route/front/module.js
deleted file mode 100644
index bd7b1516b..000000000
--- a/modules/route/front/module.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import {ng} from 'core/vendor';
-
-export default ng.module('route', ['vnCore']);
diff --git a/modules/route/front/routes.json b/modules/route/front/routes.json
deleted file mode 100644
index 95da1e143..000000000
--- a/modules/route/front/routes.json
+++ /dev/null
@@ -1,22 +0,0 @@
-/* {
-    "module": "route",
-    "name": "Routes",
-    "icon" : "local_shipping",
-    "validations" : true,
-    "routes": [
-        {
-            "url": "/route",
-            "state": "route",
-            "abstract": true,
-            "component": "ui-view",
-            "description": "Routes"
-        },
-        {
-            "url": "/index?q",
-            "state": "route.index",
-            "component": "vn-route-index",
-            "description": "Routes",
-            "acl": ["developer"]
-        }
-    ]
-} */
\ No newline at end of file
diff --git a/modules/ticket/front/create/card.html b/modules/ticket/front/create/card.html
index f55fb2787..34a21bcff 100644
--- a/modules/ticket/front/create/card.html
+++ b/modules/ticket/front/create/card.html
@@ -3,7 +3,7 @@
     vn-id="client"
     url="/api/Clients"
     label="Client"
-    search-function="{or: [{id: {regexp: $search}}, {name: {regexp: $search}}]}"
+    search-function="{or: [{id: $search}, {name: {like: '%'+ $search +'%'}}]}"
     show-field="name"
     value-field="id"
     field="$ctrl.clientFk"
diff --git a/modules/ticket/front/package/index.html b/modules/ticket/front/package/index.html
index f6d9dfd2d..c32c131ec 100644
--- a/modules/ticket/front/package/index.html
+++ b/modules/ticket/front/package/index.html
@@ -21,7 +21,7 @@
                     label="Package"
                     show-field="name"
                     value-field="packagingFk"
-                    search-function="{or: [{itemFk: {like: '%'+ $search +'%'}}, {'name': {like: '%'+ $search +'%'}}]}"
+                    search-function="{or: [{itemFk: $search}, {'name': {like: '%'+ $search +'%'}}]}"
                     field="package.packagingFk">
                     <tpl-item>{{itemFk}} : {{name}}</tpl-item>
                 </vn-autocomplete>
diff --git a/print/common/css/layout.css b/print/common/css/layout.css
index 3f540622e..294593142 100644
--- a/print/common/css/layout.css
+++ b/print/common/css/layout.css
@@ -120,8 +120,7 @@
     font-weight: bold
 }
 
-
-.grid .row.inline > div {
+.grid .row.inline > section {
     float: left;
 }
 
@@ -129,11 +128,13 @@
     border: 1px solid #DDD;
     margin-bottom: 10px;
     position: relative;
-    padding:10px
+    padding:20px
 }
 
 .panel .header {
-    font-weight: bold
+    background-color: #FFF;
+    font-weight: bold;
+    margin-top: -20px
 }
 
 .box {
diff --git a/print/common/css/misc.css b/print/common/css/misc.css
new file mode 100644
index 000000000..d1e7edf27
--- /dev/null
+++ b/print/common/css/misc.css
@@ -0,0 +1,15 @@
+.uppercase {
+    text-transform: uppercase
+}
+
+.centered {
+    text-align: center
+}
+
+.number {
+    text-align: right
+}
+
+.gray {
+    color: #555
+}
\ No newline at end of file
diff --git a/print/lib/emailEngine.js b/print/lib/emailEngine.js
index 86342bb36..2ccff4f87 100644
--- a/print/lib/emailEngine.js
+++ b/print/lib/emailEngine.js
@@ -88,7 +88,7 @@ module.exports = {
                 const componentPath = `${this.path}/${orgComponent.name}`;
                 let fileSrc = componentPath + file;
 
-                if (file.slice(0, 4) === 'http' || file.slice(0, 4) === 'https')
+                if (file.slice(0, 4) === 'http' || file.slice(0, 5) === 'https')
                     fileSrc = file;
 
                 const fileName = file.split('/').pop();
diff --git a/print/lib/router.js b/print/lib/router.js
index 30fd0d347..69b02b702 100644
--- a/print/lib/router.js
+++ b/print/lib/router.js
@@ -14,7 +14,7 @@ module.exports = app => {
     function registerReport(name) {
         if (!name) throw new Error('Report name required');
 
-        app.get(`/report/${name}`, (request, response, next) => {
+        app.get(`/api/report/${name}`, (request, response, next) => {
             reportEngine.toPdf(name, request).then(stream => {
                 response.setHeader('Content-Disposition', `attachment; filename="${name}.pdf"`);
                 response.setHeader('Content-type', 'application/pdf');
@@ -33,7 +33,7 @@ module.exports = app => {
     function registerEmail(name) {
         if (!name) throw new Error('Email name required');
 
-        app.get(`/email/${name}`, (request, response, next) => {
+        app.get(`/api/email/${name}`, (request, response, next) => {
             emailEngine.render(name, request).then(rendered => {
                 response.send(rendered.html);
             }).catch(e => {
@@ -41,7 +41,7 @@ module.exports = app => {
             });
         });
 
-        app.post(`/email/${name}`, (request, response, next) => {
+        app.post(`/api/email/${name}`, (request, response, next) => {
             emailEngine.toEmail(name, request).then(() => {
                 response.status(200).json({status: 200});
             }).catch(e => {
@@ -60,6 +60,6 @@ module.exports = app => {
             registerReport(route.name);
 
         const staticPath = this.path + `/${route.name}/assets`;
-        app.use(`/assets`, express.static(staticPath));
+        app.use(`/api/assets`, express.static(staticPath));
     });
 };
diff --git a/print/report/email-footer/assets/css/style.css b/print/report/email-footer/assets/css/style.css
index cf0242f36..9d47b193e 100644
--- a/print/report/email-footer/assets/css/style.css
+++ b/print/report/email-footer/assets/css/style.css
@@ -1,34 +1,39 @@
+@media (max-width: 400px) {
+    .buttons a {
+        display: block;
+        width: 100%
+    }
+}
+
 .buttons {
-    background-color: #FFF;
-    text-align: center;
     width: 100%
 }
 
 .buttons a {
+    display: inline-block;
+    box-sizing: border-box;
     text-decoration: none;
-    font-size: 18px;
-    color: #fff
+    font-size: 16px;
+    color: #fff;
+    width: 50%
 }
 
 .buttons .btn {
     background-color: #333;
-    min-width: 300px;
-    height: 72px;
-    display: inline-block;
     text-align: center
 }
 
 .buttons .btn .text {
     display: inline-block;
-    padding-top: 22px
+    padding: 22px 0
 }
 
 .buttons .btn .icon {
     background-color: #95d831;
+    box-sizing: border-box;
     text-align: center;
-    padding-top: 22px;
+    padding: 16.5px 0;
     float: right;
-    height: 50px;
     width: 70px
 }
 
diff --git a/print/report/email-footer/index.html b/print/report/email-footer/index.html
index fb992f15e..dd7853591 100644
--- a/print/report/email-footer/index.html
+++ b/print/report/email-footer/index.html
@@ -1,16 +1,16 @@
 <footer>
     <!-- Action button block -->
-    <!-- <section class="buttons">
+<!--     <section class="buttons">
         <a href="https://www.verdnatura.es" target="_blank">
             <div class="btn">
                 <span class="text">{{ $t('buttons.webAcccess')}}</span>
-                <span class="icon"><img src="/assets/images/action.png"/></span>
+                <span class="icon"><img :src="embeded['/assets/images/action.png']"/></span>
             </div>
         </a>
         <a href="https://goo.gl/forms/j8WSL151ZW6QtlT72" target="_blank">
             <div class="btn">
                 <span class="text">{{ $t('buttons.info')}}</span>
-                <span class="icon"><img src="/assets/images/info.png"/></span>
+                <span class="icon"><img :src="embeded['/assets/images/info.png']"/></span>
             </div>
         </a>
     </section> -->
diff --git a/print/report/email-footer/index.js b/print/report/email-footer/index.js
index 893e7276e..a2ed8473e 100755
--- a/print/report/email-footer/index.js
+++ b/print/report/email-footer/index.js
@@ -8,7 +8,7 @@ module.exports = {
     created() {
         const embeded = [];
         this.files.map(file => {
-            const src = this.isPreview ? file : `cid:${file}`;
+            const src = this.isPreview ? `/api/${file}` : `cid:${file}`;
             embeded[file] = src;
         });
         this.embeded = embeded;
@@ -16,6 +16,8 @@ module.exports = {
     data() {
         return {
             files: [
+                '/assets/images/action.png',
+                '/assets/images/info.png',
                 '/assets/images/facebook.png',
                 '/assets/images/twitter.png',
                 '/assets/images/youtube.png',
diff --git a/print/report/email-footer/locale.js b/print/report/email-footer/locale.js
index a6c8aceab..5782783e8 100644
--- a/print/report/email-footer/locale.js
+++ b/print/report/email-footer/locale.js
@@ -8,12 +8,15 @@ module.exports = {
             privacy: {
                 fiscalAddress: 'VERDNATURA LEVANTE SL, B97367486 Avda. Espioca, 100, 46460 Silla · www.verdnatura.es · clientes@verdnatura.es',
                 disclaimer: `- AVISO - Este mensaje es privado y confidencial, y debe ser utilizado 
-                    exclusivamente por la persona destinataria del mismo. Si usted ha recibido este mensaje 
-                    por error, le rogamos lo comunique al remitente y borre dicho mensaje y cualquier documento 
+                    exclusivamente por la persona destinataria del mismo. Si has recibido este mensaje 
+                    por error, te rogamos lo comuniques al remitente y borres dicho mensaje y cualquier documento 
                     adjunto que pudiera contener. Verdnatura Levante SL no renuncia a la confidencialidad ni a 
                     ningún privilegio por causa de transmisión errónea o mal funcionamiento. Igualmente no se hace 
                     responsable de los cambios, alteraciones, errores u omisiones que pudieran hacerse al mensaje una vez enviado.`,
-                law: 'En cumplimiento de lo dispuesto en la Ley Orgánica 15/1999, de Protección de Datos de Carácter Personal, le comunicamos que los datos personales que facilite se incluirán en ficheros automatizados de VERDNATURA LEVANTE S.L., pudiendo en todo momento ejercitar los derechos de acceso, rectificación, cancelación y oposición, comunicándolo por escrito al domicilio social de la entidad. La finalidad del fichero es la gestión administrativa, contabilidad, y facturación.',
+                law: `En cumplimiento de lo dispuesto en la Ley Orgánica 15/1999, de Protección de Datos de Carácter Personal, 
+                    te comunicamos que los datos personales que facilites se incluirán en ficheros automatizados de VERDNATURA LEVANTE S.L., 
+                    pudiendo en todo momento ejercitar los derechos de acceso, rectificación, cancelación y oposición, comunicándolo por 
+                    escrito al domicilio social de la entidad. La finalidad del fichero es la gestión administrativa, contabilidad, y facturación.`,
             },
         },
     },
diff --git a/print/report/email-header/index.js b/print/report/email-header/index.js
index eebbc678d..e92d2fa64 100755
--- a/print/report/email-header/index.js
+++ b/print/report/email-header/index.js
@@ -8,7 +8,7 @@ module.exports = {
     created() {
         const embeded = [];
         this.files.map(file => {
-            const src = this.isPreview ? file : `cid:${file}`;
+            const src = this.isPreview ? `/api/${file}` : `cid:${file}`;
             embeded[file] = src;
         });
         this.embeded = embeded;
diff --git a/print/report/report-footer/assets/css/index.js b/print/report/report-footer/assets/css/index.js
index c321a3fe7..c44219258 100644
--- a/print/report/report-footer/assets/css/index.js
+++ b/print/report/report-footer/assets/css/index.js
@@ -1,4 +1,6 @@
 const CssReader = require(`${appPath}/lib/cssReader`);
 
-module.exports = new CssReader([`${__dirname}/style.css`])
+module.exports = new CssReader([
+    `${__dirname}/style.css`,
+    `${appPath}/common/css/misc.css`])
     .mergeStyles();
diff --git a/print/report/report-footer/assets/css/style.css b/print/report/report-footer/assets/css/style.css
index cb1a69e4c..cd0f75570 100644
--- a/print/report/report-footer/assets/css/style.css
+++ b/print/report/report-footer/assets/css/style.css
@@ -1,6 +1,9 @@
 footer {
+    font-family: verdana, sans-serif;
     margin-top: 30px;
-    color: #555
+    font-size: 12px;
+    color: #555;
+    zoom: 0.55
 }
 
 footer, footer p {
diff --git a/print/report/report-footer/index.html b/print/report/report-footer/index.html
index b04156945..5d3caa86d 100644
--- a/print/report/report-footer/index.html
+++ b/print/report/report-footer/index.html
@@ -1,9 +1,9 @@
 <footer>
     <section class="page">
         <section :if="leftText">{{leftText}}</section>
-        <section :if="centerText">{{centerText}}</section>
+        <section :if="centerText" class="uppercase">{{centerText}}</section>
         <section class="number">{{$t('numPages')}}</section>
     </section>
-    <p>{{$t('law.phytosanitary')}}</p>
-    <p>{{$t('law.privacy')}}</p>
+    <p class="phytosanitary">{{$t('law.phytosanitary')}}</p>
+    <p v-html="$t('law.privacy')"></p>
 </footer>
diff --git a/print/report/report-footer/locale.js b/print/report/report-footer/locale.js
index 6c2b134fc..51eddc31b 100644
--- a/print/report/report-footer/locale.js
+++ b/print/report/report-footer/locale.js
@@ -7,8 +7,8 @@ module.exports = {
                 privacy: `En cumplimiento de lo dispuesto en la Ley Orgánica 15/1999, de Protección de Datos de Carácter Personal, 
                     le comunicamos que los datos personales que facilite se incluirán en ficheros automatizados de VERDNATURA LEVANTE S.L., 
                     pudiendo en todo momento ejercitar los derechos de acceso, rectificación, cancelación y oposición, comunicándolo 
-                    por escrito al domicilio social de la entidad. La finalidad del fichero 
-                    es la gestión administrativa, contabilidad, y facturación.`,
+                    por escrito al domicilio social de la entidad. <br/> 
+                    La finalidad del fichero es la gestión administrativa, contabilidad, y facturación.`,
             }
         },
     },
diff --git a/print/report/rpt-claim-pickup-order/assets/css/index.js b/print/report/rpt-claim-pickup-order/assets/css/index.js
index c1943eee1..d40ab4984 100644
--- a/print/report/rpt-claim-pickup-order/assets/css/index.js
+++ b/print/report/rpt-claim-pickup-order/assets/css/index.js
@@ -2,5 +2,6 @@ const CssReader = require(`${appPath}/lib/cssReader`);
 
 module.exports = new CssReader([
     `${appPath}/common/css/layout.css`,
+    `${appPath}/common/css/misc.css`,
     `${__dirname}/style.css`])
     .mergeStyles();
diff --git a/print/report/rpt-claim-pickup-order/assets/css/style.css b/print/report/rpt-claim-pickup-order/assets/css/style.css
index 35505aeea..53965a625 100644
--- a/print/report/rpt-claim-pickup-order/assets/css/style.css
+++ b/print/report/rpt-claim-pickup-order/assets/css/style.css
@@ -1,3 +1,10 @@
 .container {
     color: #000
+}
+
+.title {
+    font-weight: 100;
+    margin-top: 0;
+    margin-bottom: 20px;
+    font-size: 2em
 }
\ No newline at end of file
diff --git a/print/report/rpt-claim-pickup-order/index.html b/print/report/rpt-claim-pickup-order/index.html
index d73284a45..8d607f537 100644
--- a/print/report/rpt-claim-pickup-order/index.html
+++ b/print/report/rpt-claim-pickup-order/index.html
@@ -4,69 +4,69 @@
         <section class="container">
             <report-header></report-header>
             <section class="main">
-                <div class="columns">
-                    <div class="size50">
-                        <div class="size75">
-                            <h1 style="margin-top:0" class="font extraLarge" style="font-weight: 100">{{$t('title')}}</h1>
-                            <div class="row inline font normal">
-                                <div class="text font gray">{{$t('claimId')}}:</div>
-                                <div class="control">{{claimId}}</div>
-                            </div>
-                            <div class="row inline font normal">
-                                <div class="text font gray">{{$t('clientId')}}:</div>
-                                <div class="control">{{clientId}}</div>
-                            </div>
-                            <div class="row inline font normal">
-                                <div class="text font gray">{{$t('date')}}:</div>
-                                <div class="control">{{dated()}}</div>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="size50">
-                        <div class="panel">
-                            <div class="header">{{$t('clientData')}}</div>
+                <section class="columns">
+                    <section class="size50">
+                        <section class="size75">
+                            <h1 style="margin-top:0" class="title">{{$t('title')}}</h1>
+                            <section class="row inline small">
+                                <section class="text uppercase gray">{{$t('claimId')}}:</section>
+                                <section class="control">{{claimId}}</section>
+                            </section>
+                            <section class="row inline small">
+                                <section class="text uppercase gray">{{$t('clientId')}}:</section>
+                                <section class="control">{{clientId}}</section>
+                            </section>
+                            <section class="row inline small">
+                                <section class="text uppercase gray">{{$t('date')}}:</section>
+                                <section class="control">{{dated()}}</section>
+                            </section>
+                        </section>
+                    </section>
+                    <section class="size50">
+                        <section class="panel">
+                            <section class="header">{{$t('clientData')}}</section>
                             <p>
-                                <strong>{{clientName}}</strong>
+                                <strong class="uppercase">{{clientName}}</strong>
                             </p>
-                            <div>
+                            <section>
                                 {{street}}
-                            </div>
-                            <div>
+                            </section>
+                            <section>
                                 {{postcode}}, {{city}} ({{province}})
-                            </div>
-                            <div>
+                            </section>
+                            <section>
                                 {{country}}
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                            </section>
+                        </section>
+                    </section>
+                </section>
                     
-                <div class="grid" style="margin-top:20px">
-                    <div class="row header inline">
-                        <div style="width: 15%">{{$t('quantity')}}</div>
-                        <div style="width: 15%">{{$t('claims')}}</div>
-                        <div style="width: 20%">{{$t('reference')}}</div>
-                        <div style="width: 50%">{{$t('concept')}}</div>
-                    </div>
-                    <div class="row inline" v-for="sale in sales">
-                        <div class="font bold" style="width: 15%">{{sale.quantity}}&nbsp;</div>
-                        <div class="font bold" style="width: 15%">{{sale.claimQuantity}}&nbsp;</div>
-                        <div class="font bold" style="width: 20%">{{sale.id}}&nbsp;</div>
-                        <div class="font bold" style="width: 50%">{{sale.concept}}&nbsp;</div>
-                    </div>
-                </div>
+                <section class="grid" style="margin-top:20px">
+                    <section class="row header inline">
+                        <section style="width: 15%">{{$t('quantity')}}</section>
+                        <section style="width: 15%">{{$t('claims')}}</section>
+                        <section style="width: 20%">{{$t('reference')}}</section>
+                        <section style="width: 50%">{{$t('concept')}}</section>
+                    </section>
+                    <section class="row inline" v-for="sale in sales">
+                        <section class="number" style="width: 15%">{{sale.quantity}}&nbsp;</section>
+                        <section class="number" style="width: 15%">{{sale.claimQuantity}}&nbsp;</section>
+                        <section style="width: 20%">{{sale.id}}&nbsp;</section>
+                        <section style="width: 50%">{{sale.concept}}&nbsp;</section>
+                    </section>
+                </section>
 
-                <div class="columns" style="margin-top: 50px">
-                    <div class="size25">&nbsp;</div>
-                    <div class="size50">
-                        <div class="panel" style="height: 150px">
-                            <div style="text-align: center">
+                <section class="columns" style="margin-top: 50px">
+                    <section class="size25">&nbsp;</section>
+                    <section class="size50">
+                        <section class="panel" style="height: 150px">
+                            <section class="centered">
                                 <h3>{{clientName}}</h3>
-                            </div>
-                        </div>
-                    </div>
-                    <div class="size25">&nbsp;</div>
-                </div>
+                            </section>
+                        </section>
+                    </section>
+                    <section class="size25">&nbsp;</section>
+                </section>
                 <p v-html="$t('sections.agency.description')"></p>
             </section>
 
diff --git a/print/report/rpt-claim-pickup-order/locale.js b/print/report/rpt-claim-pickup-order/locale.js
index 573001918..9ba80b456 100644
--- a/print/report/rpt-claim-pickup-order/locale.js
+++ b/print/report/rpt-claim-pickup-order/locale.js
@@ -13,7 +13,7 @@ module.exports = {
             claim: 'Reclamación {0}',
             sections: {
                 agency: {
-                    description: `Para agilizar su recogida, por favor, póngase en contacto con la oficina de integrados. <br/>
+                    description: `Para agilizar tu recogida, por favor, pónte en contacto con la oficina de integrados. <br/>
                         Tlf: 96 166 77 88 - Ana Gómez <em>(agomezf@integra2.es)</em>`
                 }
             }
diff --git a/webpack.config.js b/webpack.config.js
index e0aee3572..185c97b56 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -70,6 +70,12 @@ let baseConfig = {
             'vn-loopback': `${__dirname}/loopback`
         }
     },
+    watchOptions: {
+        ignored: [
+            'node_modules',
+            './modules/*/back/**'
+        ]
+    },
     plugins: [
         new HtmlWebpackPlugin({
             template: 'front/salix/index.ejs',