diff --git a/@salix/app/src/app.js b/@salix/app/src/app.js
index 55ca62470e..bf5992122b 100644
--- a/@salix/app/src/app.js
+++ b/@salix/app/src/app.js
@@ -7,5 +7,8 @@ import padding from './styles/layout.css'
 import margin from './styles/margin.scss'
 import layout from './styles/padding.scss'
 import background from './styles/background.scss'
+import border from './styles/border.scss'
+import fontStyle from './styles/font-style.scss'
+import misc from './styles/misc.scss'
 
 bootstrap();
diff --git a/@salix/app/src/styles/border.scss b/@salix/app/src/styles/border.scss
new file mode 100644
index 0000000000..2afa4fd8a0
--- /dev/null
+++ b/@salix/app/src/styles/border.scss
@@ -0,0 +1,45 @@
+@import "colors";
+
+$border-color: #AAA;
+$border-thin: 1px;
+$border-thick: 2px;
+
+html [border-none], .border-none {
+    border: 0;
+}
+
+/* Solid border */
+
+html [border-solid], .border-solid {
+    border: $border-thin solid $border-color;
+}
+html [border-solid-top], .border-solid-top {
+    border-top: $border-thin solid $border-color;
+}
+html [border-solid-left], .border-solid-left {
+    border-left: $border-thin solid $border-color;
+}
+html [border-solid-right], .border-solid-right {
+    border-right: $border-thin solid $border-color;
+}
+html [border-solid-bottom], .border-solid-bottom {
+    border-bottom: $border-thin solid $border-color;
+}
+
+/* Dashed border */
+
+html [border-dashed], .border-dashed {
+    border: $border-thin dashed $border-color;
+}
+html [border-dashed-top], .border-dashed-top {
+    border-top: $border-thin dashed $border-color;
+}
+html [border-dashed-left], .border-dashed-left {
+    border-left: $border-thin dashed $border-color;
+}
+html [border-dashed-right], .border-dashed-right {
+    border-right: $border-thin dashed $border-color;
+}
+html [border-dashed-bottom], .border-dashed-bottom {
+    border-bottom: $border-thin dashed $border-color;
+}
diff --git a/@salix/app/src/styles/colors.scss b/@salix/app/src/styles/colors.scss
index 734adf05f4..87226d7360 100644
--- a/@salix/app/src/styles/colors.scss
+++ b/@salix/app/src/styles/colors.scss
@@ -1,8 +1,7 @@
 
 $color-green: rgb(139,195,74);
 $color-orange: rgb(255,171,64);
-$color-dark-grey: #424242;
-$color-light-grey: #e6e6e6;
 $color-white: white;
 $color-dark: #3c393b;
-
+$color-dark-grey: #424242;
+$color-light-grey: #e6e6e6;
\ No newline at end of file
diff --git a/@salix/app/src/styles/font-style.scss b/@salix/app/src/styles/font-style.scss
new file mode 100644
index 0000000000..59755abf4f
--- /dev/null
+++ b/@salix/app/src/styles/font-style.scss
@@ -0,0 +1,10 @@
+@import "colors";
+
+$font-color: $color-dark-grey;
+
+body {
+    color: $font-color;
+}
+html [uppercase], .uppercase {
+    text-transform: uppercase;
+}
\ No newline at end of file
diff --git a/@salix/app/src/styles/misc.scss b/@salix/app/src/styles/misc.scss
new file mode 100644
index 0000000000..cecf042daf
--- /dev/null
+++ b/@salix/app/src/styles/misc.scss
@@ -0,0 +1,7 @@
+@import "padding";
+
+.form {
+    height: 100%;
+    box-sizing: border-box;
+    padding: $pad-large;
+}
\ No newline at end of file
diff --git a/@salix/crud/src/client/addresses/index.html b/@salix/crud/src/client/addresses/index.html
index c936878b9e..65069c6c03 100644
--- a/@salix/crud/src/client/addresses/index.html
+++ b/@salix/crud/src/client/addresses/index.html
@@ -1,17 +1,17 @@
-<vn-vertical full-height pad-large style="box-sizing: border-box;">
+<vn-vertical class="form">
     <vn-horizontal>
         <h3 style="margin-top: 0;">Addresses</h3>
     </vn-horizontal>
-    <vn-horizontal style="border-bottom: .1em dashed; text-transform: uppercase; text-align: center;" class="pad-medium-bottom">
+    <vn-horizontal class="pad-medium-bottom border-dashed-bottom uppercase" style="text-align: center;">
         <vn-empty style="width: 7em;">Default</vn-empty>
         <vn-auto>Consignee</vn-auto>
         <vn-empty style="width: 7em;">Enabled</vn-empty>
     </vn-horizontal>
-    <vn-horizontal ng-repeat="i in $ctrl.addresses" style="align-items: center;" class="pad-medium-top">
+    <vn-horizontal ng-repeat="i in $ctrl.addresses" class="pad-medium-top" style="align-items: center;">
         <vn-empty style="width: 7em; text-align: center;">
             <input type="radio" name="default"/>
         </vn-empty>
-        <vn-auto style="border: 1px solid black; border-radius: .5em;" class="pad-small">
+        <vn-auto style="border-radius: .5em;" class="pad-small border-solid">
             <button style="float: right;">
                 Edit
             </button>
diff --git a/@salix/crud/src/client/addresses/index.js b/@salix/crud/src/client/addresses/index.js
index 97e7825286..307209ab7f 100644
--- a/@salix/crud/src/client/addresses/index.js
+++ b/@salix/crud/src/client/addresses/index.js
@@ -6,27 +6,20 @@ export const COMPONENT = {
     template: template,
 	controller: function ($http)
 	{
-		this.addresses = [{
-			consignee: 'Consignee 1',
-			street: 'Street',
-			city: 'City',
-			postcode: '46600',
-			province: 'Province',
-			country: 'Country',
-			phone: 'XX-XXX-XX-XX',
-			mobile: 'XX-6XX-XX-XX',
-			enabled: true
-		},{
-			consignee: 'Consignee 2',
-			street: 'Street',
-			city: 'City',
-			postcode: '46600',
-			province: 'Province',
-			country: 'Country',
-			phone: 'XX-XXX-XX-XX',
-			mobile: 'XX-6XX-XX-XX',
-			enabled: false
-		}];
+		this.addresses = [];
+		
+		for (var i = 1; i <= 4; i++)
+			this.addresses.push ({
+				consignee: 'Consignee '+ i,
+				street: 'Street',
+				city: 'City',
+				postcode: '46600',
+				province: 'Province',
+				country: 'Country',
+				phone: '+XX XXX XX XX XX',
+				mobile: '+XX 6XX XX XX XX',
+				enabled: i % 2 == 0
+			});
 	},
 };
 module.component(NAME, COMPONENT);
diff --git a/@salix/crud/src/client/basic-data/index.html b/@salix/crud/src/client/basic-data/index.html
index 5eafbea407..c6c910a534 100644
--- a/@salix/crud/src/client/basic-data/index.html
+++ b/@salix/crud/src/client/basic-data/index.html
@@ -1,5 +1,5 @@
 <form ng-submit="$ctrl.submit()">
-<vn-vertical full-height pad-large style="box-sizing: border-box;">
+<vn-vertical  class="form">
     <vn-horizontal>
         <vn-one>
             <h3 style="margin-top: 0;">Datos básicos</h3>
diff --git a/dev.sh b/dev.sh
index 6c789897de..87123d9fe8 100755
--- a/dev.sh
+++ b/dev.sh
@@ -13,7 +13,6 @@ case "$1" in
         $0 stop
         echo "################################ Starting services"
         forever start forever.json
-        forever list
         "$nginxBin" -c "$nginxConf" -p "$nginxPrefix"
         cd @salix && gulp
     ;;