diff --git a/.gitignore b/.gitignore
index 1b585447..7cfba852 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,7 +13,6 @@
 #Custom
 node_modules
 *.pid
-package-lock.json
 
 #Ignore vim temporary files
 *.sw*
diff --git a/.travis.yml b/.travis.yml
index 68566258..15fc7119 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,12 @@ notifications:
     slack: gppmds8-github:sJE6QlBfPGMkfUf48wuTsKa7
 
 script:
-  - "npm test"
+  - docker pull alaxalves/front:1.3
+  - docker create --name travis -v `pwd`:/Falko-2017.2-BackEnd alaxalves/front:1.3
+  - sudo docker start travis
+  - docker logs -f travis
+  - test `docker ps -a --filter exited=1 | wc -l` == "1"
+
 
 after_success:
-  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
+  - ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 741bd915..632dfbae 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -23,7 +23,7 @@
     "acorn": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.1.2.tgz",
-      "integrity": "sha512-o96FZLJBPY1lvTuJylGA9Bk3t/GKPPJG8H0ydQQl01crzwJgspa4AEIq/pVTXigmK0PHVQhiAtn8WMBLL9D2WA==",
+      "integrity": "sha1-kRy1PgNoB88Pp3jcXTcPvYZCRtc=",
       "dev": true
     },
     "acorn-dynamic-import": {
@@ -123,7 +123,7 @@
     "ansi-styles": {
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.0.tgz",
-      "integrity": "sha512-NnSOmMEYtVR2JVMIGTzynRkkaxtiq1xnFBcdQD/DnNCYPoEPsVJhM98BDyaoNOQIi7p4okdi3E27eN7GQbsUug==",
+      "integrity": "sha1-wVm41b4PnlpvNG2rlPFs4CIWG4g=",
       "dev": true,
       "requires": {
         "color-convert": "1.9.0"
@@ -132,7 +132,7 @@
     "anymatch": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
-      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "integrity": "sha1-VT3Lj5HjyImEXf26NMd3IbkLnXo=",
       "dev": true,
       "requires": {
         "micromatch": "2.3.11",
@@ -160,7 +160,7 @@
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
-      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "integrity": "sha1-NgSLv/TntH4TZkQxbJlmnqWukfE=",
       "dev": true
     },
     "array-find-index": {
@@ -246,7 +246,7 @@
     "async": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/async/-/async-2.5.0.tgz",
-      "integrity": "sha512-e+lJAJeNWuPCNyxZKOBdaJGyLGHugXVQtrAwtuAe2vhxTYxFTKE73p8JuTmdH0qdQZtDvI4dhJwjZc5zsfIsYw==",
+      "integrity": "sha1-hDGQ/WtzV6C54clW7d3V7IRitU0=",
       "dev": true,
       "requires": {
         "lodash": "4.17.4"
@@ -543,7 +543,7 @@
     "babel-loader": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-7.1.2.tgz",
-      "integrity": "sha512-jRwlFbINAeyDStqK6Dd5YuY0k5YuzQUvlz2ZamuXrXmxav3pNqe9vfJ402+2G+OmlJSXxCOpB6Uz0INM7RQe2A==",
+      "integrity": "sha1-9svhInEPGqKvTYgcbVtUNYyiQSY=",
       "dev": true,
       "requires": {
         "find-cache-dir": "1.0.0",
@@ -961,7 +961,7 @@
     "babel-preset-env": {
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/babel-preset-env/-/babel-preset-env-1.6.0.tgz",
-      "integrity": "sha512-OVgtQRuOZKckrILgMA5rvctvFZPv72Gua9Rt006AiPoB0DJKGN07UmaQA+qRrYgK71MVct8fFhT0EyNWYorVew==",
+      "integrity": "sha1-LeHHgqeAoKXWBdGZyVdZbaQ8ROQ=",
       "dev": true,
       "requires": {
         "babel-plugin-check-es2015-constants": "6.22.0",
@@ -1091,7 +1091,7 @@
     "babylon": {
       "version": "6.18.0",
       "resolved": "https://registry.npmjs.org/babylon/-/babylon-6.18.0.tgz",
-      "integrity": "sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==",
+      "integrity": "sha1-ry87iPpvXB5MY00aD46sT1WzleM=",
       "dev": true
     },
     "backo2": {
@@ -1115,7 +1115,7 @@
     "base64-js": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
-      "integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw==",
+      "integrity": "sha1-qRlH2h9KUW6jjltOwOw3c2deCIY=",
       "dev": true
     },
     "base64id": {
@@ -1170,7 +1170,7 @@
     "bn.js": {
       "version": "4.11.8",
       "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.11.8.tgz",
-      "integrity": "sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==",
+      "integrity": "sha1-LN4J617jQfSEdGuwMJsyU7GxRC8=",
       "dev": true
     },
     "body-parser": {
@@ -1242,7 +1242,7 @@
     "browserify-aes": {
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.0.8.tgz",
-      "integrity": "sha512-WYCMOT/PtGTlpOKFht0YJFYcPy6pLCR98CtWfzK13zoynLlBMvAdEMSRGmgnJCw2M2j/5qxBkinZQFobieM8dQ==",
+      "integrity": "sha1-yPo7G3WFu3unfFVgtgmW3extUwk=",
       "dev": true,
       "requires": {
         "buffer-xor": "1.0.3",
@@ -1312,7 +1312,7 @@
     "browserslist": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-2.4.0.tgz",
-      "integrity": "sha512-aM2Gt4x9bVlCUteADBS6JP0F+2tMWKM1jQzUulVROtdFWFIcIVvY76AJbr7GDqy0eDhn+PcnpzzivGxY4qiaKQ==",
+      "integrity": "sha1-aT7pPQHmZGimNI2lSY4BH1ePh/g=",
       "dev": true,
       "requires": {
         "caniuse-lite": "1.0.30000738",
@@ -1470,7 +1470,7 @@
     "chalk": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.1.0.tgz",
-      "integrity": "sha512-LUHGS/dge4ujbXMJrnihYMcL4AoOweGnw9Tp3kQuqy1Kx5c1qKjqvMJZ6nVJPMWJtKCTN72ZogH3oeSO9g9rXQ==",
+      "integrity": "sha1-rFvs8U+iG5nGySynp9fP1bF+dD4=",
       "dev": true,
       "requires": {
         "ansi-styles": "3.2.0",
@@ -1510,7 +1510,7 @@
     "cipher-base": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/cipher-base/-/cipher-base-1.0.4.tgz",
-      "integrity": "sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==",
+      "integrity": "sha1-h2Dk7MJy9MNjUy+SbYdKriwTl94=",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
@@ -1696,7 +1696,7 @@
     "commander": {
       "version": "2.11.0",
       "resolved": "https://registry.npmjs.org/commander/-/commander-2.11.0.tgz",
-      "integrity": "sha512-b0553uYA5YAEGgyYIGYROzKQ7X5RAqedkfjiZxwi0kL1g3bOaBNNZfYkzt/CL0umgD5wc9Jec2FbB98CjkMRvQ==",
+      "integrity": "sha1-FXFS/R56bI2YpbcVzzdt+SgARWM=",
       "dev": true
     },
     "commondir": {
@@ -1901,7 +1901,7 @@
     "cosmiconfig": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-2.2.2.tgz",
-      "integrity": "sha512-GiNXLwAFPYHy25XmTPpafYvn3CLAkJ8FLsscq78MQd1Kh0OU6Yzhn4eV2MVF4G9WEQZoWEGltatdR+ntGPMl5A==",
+      "integrity": "sha1-YXPOvVb6wELB9DkO33r2wHx8uJI=",
       "dev": true,
       "requires": {
         "is-directory": "0.3.1",
@@ -2001,7 +2001,7 @@
     "crypto-browserify": {
       "version": "3.11.1",
       "resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz",
-      "integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==",
+      "integrity": "sha1-lIlF78Z1ekANbl5a9HGU0QBkJ58=",
       "dev": true,
       "requires": {
         "browserify-cipher": "1.0.0",
@@ -2025,7 +2025,7 @@
     "css-loader": {
       "version": "0.28.7",
       "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-0.28.7.tgz",
-      "integrity": "sha512-GxMpax8a/VgcfRrVy0gXD6yLd5ePYbXX/5zGgTVYp4wXtJklS8Z2VaUArJgc//f6/Dzil7BaJObdSv8eKKCPgg==",
+      "integrity": "sha1-Xy7pid0y7dkHcX+VMxdlYWCZnBs=",
       "dev": true,
       "requires": {
         "babel-code-frame": "6.26.0",
@@ -2305,7 +2305,7 @@
     "data-uri-to-buffer": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz",
-      "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==",
+      "integrity": "sha1-dxY+qcINhkG0cH6PGKvfmnjzSDU=",
       "dev": true
     },
     "date-now": {
@@ -2828,7 +2828,7 @@
     "evp_bytestokey": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/evp_bytestokey/-/evp_bytestokey-1.0.3.tgz",
-      "integrity": "sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==",
+      "integrity": "sha1-f8vbGY3HGVlDLv4ThCaE4FJaywI=",
       "dev": true,
       "requires": {
         "md5.js": "1.3.4",
@@ -3042,7 +3042,7 @@
     "file-loader": {
       "version": "0.11.2",
       "resolved": "https://registry.npmjs.org/file-loader/-/file-loader-0.11.2.tgz",
-      "integrity": "sha512-N+uhF3mswIFeziHQjGScJ/yHXYt3DiLBeC+9vWW+WjUBiClMSOlV1YrXQi+7KM2aA3Rn4Bybgv+uXFQbfkzpvg==",
+      "integrity": "sha1-T/HfKK84cZpgmAk7iMgscdF5SjQ=",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0"
@@ -3051,7 +3051,7 @@
     "file-uri-to-path": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
-      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "integrity": "sha1-VTp7hEb/b2hDWcRF8eN6BdrMM90=",
       "dev": true
     },
     "filename-regex": {
@@ -3277,7 +3277,7 @@
     "function-bind": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
+      "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=",
       "dev": true
     },
     "get-caller-file": {
@@ -3295,7 +3295,7 @@
     "get-uri": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.1.tgz",
-      "integrity": "sha512-7aelVrYqCLuVjq2kEKRTH8fXPTC0xKTkM+G7UlFkEwCXY3sFbSxvY375JoFowOAYbkaU47SrBvOefUlLZZ+6QA==",
+      "integrity": "sha1-29ysrNjGCKODFoaTaBF2l6FjHFk=",
       "dev": true,
       "requires": {
         "data-uri-to-buffer": "1.2.0",
@@ -3318,7 +3318,7 @@
     "glob": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
-      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "integrity": "sha1-wZyd+aAocC1nhhI4SmVSQExjbRU=",
       "dev": true,
       "requires": {
         "fs.realpath": "1.0.0",
@@ -3351,7 +3351,7 @@
     "globals": {
       "version": "9.18.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz",
-      "integrity": "sha512-S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==",
+      "integrity": "sha1-qjiWs+abSH8X4x7SFD1pqOMMLYo=",
       "dev": true
     },
     "graceful-fs": {
@@ -3512,7 +3512,7 @@
     "hash.js": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/hash.js/-/hash.js-1.1.3.tgz",
-      "integrity": "sha512-/UETyP0W22QILqS+6HowevwhEFJ3MBJnwTf75Qob9Wz9t0DPuisL8kW8YZMK62dHAKE1c1p+gY1TtOLY+USEHA==",
+      "integrity": "sha1-NA3tvmKQGHFRweodd3o0SJNd+EY=",
       "dev": true,
       "requires": {
         "inherits": "2.0.3",
@@ -3577,7 +3577,7 @@
     "hosted-git-info": {
       "version": "2.5.0",
       "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.5.0.tgz",
-      "integrity": "sha512-pNgbURSuab90KbTqvRPsseaTxOJCZBD0a7t+haSN33piP9cCM4l0CqdzAif2hUqm716UovKB2ROmiabGAKVXyg==",
+      "integrity": "sha1-bWDjSzq7yDEwYsO3mO+NkBoHrzw=",
       "dev": true
     },
     "html-comment-regex": {
@@ -3846,7 +3846,7 @@
     "inject-loader": {
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/inject-loader/-/inject-loader-3.0.1.tgz",
-      "integrity": "sha512-0Kd4NqMJUhknG4ECiJ/mgyHJBpfBBWZ3IKHl2BLNQiFtMO7/xiv9mmHl7mGvE0iKrBeQAZdMcQP3sMXZN0cqeg==",
+      "integrity": "sha1-hEpFlhUM9rhkwveYBtQKLK7kwsc=",
       "dev": true,
       "requires": {
         "babel-core": "6.26.0"
@@ -4146,7 +4146,7 @@
     "istanbul-lib-coverage": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-1.1.1.tgz",
-      "integrity": "sha512-0+1vDkmzxqJIn5rcoEqapSB4DmPxE31EtI2dF2aCkV5esN9EWHxZ0dwgDClivMXJqE7zaYQxq30hj5L0nlTN5Q==",
+      "integrity": "sha1-c7+5mIhSmUFck9OKPprfeEp3qdo=",
       "dev": true
     },
     "istanbul-lib-instrument": {
@@ -4202,7 +4202,7 @@
     "json-loader": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/json-loader/-/json-loader-0.5.7.tgz",
-      "integrity": "sha512-QLPs8Dj7lnf3e3QYS1zkCo+4ZwqOiF9d/nZnYozTISxXWCfNs9yuky5rJw4/W34s7POaNlbZmQGaB5NiXCbP4w==",
+      "integrity": "sha1-3KFKcCNf+C8KyaOr62DTN6NlGF0=",
       "dev": true
     },
     "json-schema": {
@@ -4274,7 +4274,7 @@
     "karma": {
       "version": "1.7.1",
       "resolved": "https://registry.npmjs.org/karma/-/karma-1.7.1.tgz",
-      "integrity": "sha512-k5pBjHDhmkdaUccnC7gE3mBzZjcxyxYsYVaqiL2G5AqlfLyBO5nw2VdNK+O16cveEPd/gIOWULH7gkiYYwVNHg==",
+      "integrity": "sha1-hcwI6eCiLXzpzKN8ShvoJPaisa4=",
       "dev": true,
       "requires": {
         "bluebird": "3.5.0",
@@ -4377,7 +4377,7 @@
     "karma-sinon-chai": {
       "version": "1.3.2",
       "resolved": "https://registry.npmjs.org/karma-sinon-chai/-/karma-sinon-chai-1.3.2.tgz",
-      "integrity": "sha512-JbV4xobGA4srGuR30YQszmgzv4YpKHpkQWSEBCBBj7OrCMSW4/9GIwtGLHMk/3sT94/b5zveVMR2CV5V2Y3dOg==",
+      "integrity": "sha1-6k2XsWQz5kgTqt3d3tf3u0M4IV4=",
       "dev": true,
       "requires": {
         "lolex": "1.6.0"
@@ -4849,7 +4849,7 @@
     "lru-cache": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.1.tgz",
-      "integrity": "sha512-q4spe4KTfsAS1SUHLO0wz8Qiyf1+vMIAgpRYioFYDMNqKfHQbg+AVDH3i4fvpl71/P1L0dBl+fQi+P37UYf0ew==",
+      "integrity": "sha1-Yi4y6CSItJJ5EUpPns9F581rulU=",
       "dev": true,
       "requires": {
         "pseudomap": "1.0.2",
@@ -5032,7 +5032,7 @@
     "minimatch": {
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
-      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "integrity": "sha1-UWbihkV/AzBgZL5Ul+jbsMPTIIM=",
       "dev": true,
       "requires": {
         "brace-expansion": "1.1.8"
@@ -5344,7 +5344,7 @@
     "normalize-package-data": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.4.0.tgz",
-      "integrity": "sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==",
+      "integrity": "sha1-EvlaMH1YNSB1oEkHuErIvpisAS8=",
       "dev": true,
       "requires": {
         "hosted-git-info": "2.5.0",
@@ -5465,7 +5465,7 @@
     "opn": {
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/opn/-/opn-5.1.0.tgz",
-      "integrity": "sha512-iPNl7SyM8L30Rm1sjGdLLheyHVw5YXVfi3SKWJzBI7efxRwHojfRFjwE/OLM6qp9xJYMgab8WicTU1cPoY+Hpg==",
+      "integrity": "sha1-cs4jBqF9vqWP8QQYUzUrSo/HdRk=",
       "dev": true,
       "requires": {
         "is-wsl": "1.1.0"
@@ -5621,7 +5621,7 @@
     "pac-proxy-agent": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-1.1.0.tgz",
-      "integrity": "sha512-QBELCWyLYPgE2Gj+4wUEiMscHrQ8nRPBzYItQNOHWavwBt25ohZHQC4qnd5IszdVVrFbLsQ+dPkm6eqdjJAmwQ==",
+      "integrity": "sha1-NKOF399h0vDsrOCIWMdF0+eR/U0=",
       "dev": true,
       "requires": {
         "agent-base": "2.1.1",
@@ -7962,7 +7962,7 @@
     "randomatic": {
       "version": "1.1.7",
       "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-1.1.7.tgz",
-      "integrity": "sha512-D5JUjPyJbaJDkuAazpVnSfVkLlpeO3wDlPROTMLGKG1zMFNFRgrciKo1ltz/AzNTkqE0HzDx655QOL51N06how==",
+      "integrity": "sha1-x6vpzIuHwLqodrGf3oP9RkeX44w=",
       "dev": true,
       "requires": {
         "is-number": "3.0.0",
@@ -8003,7 +8003,7 @@
     "randombytes": {
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.0.5.tgz",
-      "integrity": "sha512-8T7Zn1AhMsQ/HI1SjcCfT/t4ii3eAqco3yOcSzS4mozsOz69lHLsoMXmF9nZgnFanYscnSlUSgs8uZyKzpE6kg==",
+      "integrity": "sha1-3ACaJGuNCaF3tLegrne8Vw9LG3k=",
       "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
@@ -8072,7 +8072,7 @@
     "readable-stream": {
       "version": "2.3.3",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.3.tgz",
-      "integrity": "sha512-m+qzzcn7KUxEmd1gMbchF+Y2eIUbieUaxkWtptyHywrX0rE8QEYqPC07Vuy4Wm32/xE16NcdBctb8S0Xe/5IeQ==",
+      "integrity": "sha1-No8lEtefnUb9/HE0mueHi7weuVw=",
       "dev": true,
       "requires": {
         "core-util-is": "1.0.2",
@@ -8160,13 +8160,13 @@
     "regenerator-runtime": {
       "version": "0.11.0",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.0.tgz",
-      "integrity": "sha512-/aA0kLeRb5N9K0d4fw7ooEbI+xDe+DKD499EQqygGqeS8N3xto15p09uY2xj7ixP81sNPXvRLnAQIqdVStgb1A==",
+      "integrity": "sha1-flT+W1zNXWYk6mJVw0c74JC4AuE=",
       "dev": true
     },
     "regenerator-transform": {
       "version": "0.10.1",
       "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.10.1.tgz",
-      "integrity": "sha512-PJepbvDbuK1xgIgnau7Y90cwaAmO/LCLMI2mPvaXq2heGMR3aWW5/BQvYrhJ8jgmQjXewXvBjzfqKcVOmhjZ6Q==",
+      "integrity": "sha1-HkmWg3Ix2ot/PPQRTXG1aRoGgN0=",
       "dev": true,
       "requires": {
         "babel-runtime": "6.26.0",
@@ -8177,7 +8177,7 @@
     "regex-cache": {
       "version": "0.4.4",
       "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
-      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "integrity": "sha1-db3FiioUls7EihKDW8VMjVYjNt0=",
       "dev": true,
       "requires": {
         "is-equal-shallow": "0.1.3"
@@ -8381,7 +8381,7 @@
     "safe-buffer": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
-      "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg==",
+      "integrity": "sha1-iTMSr2myEj3vcfV4iQAWce6yyFM=",
       "dev": true
     },
     "samsam": {
@@ -8393,7 +8393,7 @@
     "sax": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
-      "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
+      "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=",
       "dev": true
     },
     "schema-utils": {
@@ -8408,13 +8408,13 @@
     "selenium-server": {
       "version": "3.5.3",
       "resolved": "https://registry.npmjs.org/selenium-server/-/selenium-server-3.5.3.tgz",
-      "integrity": "sha512-apELZb+nk5SdwGL84Aw9OmUBN/l4JeXgWd3oxc0Lg2r9yCMX5b9dJzIfdj5Tp3GytY2hz7lXuH7DrKZYObxktA==",
+      "integrity": "sha1-J4wK9hrClhR2pZxv+VEhbWfyCVw=",
       "dev": true
     },
     "semver": {
       "version": "5.4.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
-      "integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg==",
+      "integrity": "sha1-4FnAnYVx8FQII3M0M1BdOi8AsY4=",
       "dev": true
     },
     "send": {
@@ -8519,7 +8519,7 @@
     "sinon": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/sinon/-/sinon-2.4.1.tgz",
-      "integrity": "sha512-vFTrO9Wt0ECffDYIPSP/E5bBugt0UjcBQOfQUMh66xzkyPEnhl/vM2LRZi2ajuTdkH07sA6DzrM6KvdvGIH8xw==",
+      "integrity": "sha1-Ah/WS1TLd9nS+w1Dze3652KcOjY=",
       "dev": true,
       "requires": {
         "diff": "3.2.0",
@@ -8558,7 +8558,7 @@
     "sinon-chai": {
       "version": "2.13.0",
       "resolved": "https://registry.npmjs.org/sinon-chai/-/sinon-chai-2.13.0.tgz",
-      "integrity": "sha512-hRNu/TlYEp4Rw5IbzO8ykGoZMSG489PGUx1rvePpHGrtl20cXivRBgtr/EWYxIwL9EOO9+on04nd9k3tW8tVww==",
+      "integrity": "sha1-uaQugBwgI0v8L0Oynm9PYbYJkMQ=",
       "dev": true
     },
     "slash": {
@@ -8745,7 +8745,7 @@
     "socks-proxy-agent": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-2.1.1.tgz",
-      "integrity": "sha512-sFtmYqdUK5dAMh85H0LEVFUCO7OhJJe1/z2x/Z6mxp3s7/QPf1RkZmpZy+BpuU0bEjcV9npqKjq9Y3kwFUjnxw==",
+      "integrity": "sha1-huuwcZMlhjeHDhO3vZnybGY989M=",
       "dev": true,
       "requires": {
         "agent-base": "2.1.1",
@@ -8765,7 +8765,7 @@
     "source-list-map": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
-      "integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+      "integrity": "sha1-qqR0A/eyRakvvJfqCPJQ1gh+0IU=",
       "dev": true
     },
     "source-map": {
@@ -8829,7 +8829,7 @@
     "stackframe": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/stackframe/-/stackframe-1.0.4.tgz",
-      "integrity": "sha512-to7oADIniaYwS3MhtCa/sQhrxidCCQiF/qp4/m5iN3ipf0Y7Xlri0f6eG29r08aL7JYl8n32AF3Q5GYBZ7K8vw==",
+      "integrity": "sha1-NXskqZL5Qny6a1RdlqFO0svKGHs=",
       "dev": true
     },
     "statuses": {
@@ -8851,7 +8851,7 @@
     "stream-http": {
       "version": "2.7.2",
       "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-2.7.2.tgz",
-      "integrity": "sha512-c0yTD2rbQzXtSsFSVhtpvY/vS6u066PcXOX9kBB3mSO76RiUQzL340uJkGBWnlBg4/HZzqiUXtaVA7wcRcJgEw==",
+      "integrity": "sha1-QKBQ7I3DtTsz2ZCUFcAsC/Gr+60=",
       "dev": true,
       "requires": {
         "builtin-status-codes": "3.0.0",
@@ -8870,7 +8870,7 @@
     "string_decoder": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.0.3.tgz",
-      "integrity": "sha512-4AH6Z5fzNNBcH+6XDMfA/BTt87skxqJlO0lAh3Dker5zThcAxG6mKz+iGu308UKoPPQ8Dcqx/4JhujzltRa+hQ==",
+      "integrity": "sha1-D8Z9fBQYJd6UKC3VNr7GubzoYKs=",
       "dev": true,
       "requires": {
         "safe-buffer": "5.1.1"
@@ -8932,7 +8932,7 @@
     "supports-color": {
       "version": "4.4.0",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-4.4.0.tgz",
-      "integrity": "sha512-rKC3+DyXWgK0ZLKwmRsrkyHVZAjNkfzeehuFWdGGcqGDTZFH73+RH6S/RDAAxl9GusSjZSUWYLmT9N5pzXFOXQ==",
+      "integrity": "sha1-iD992rwWUUKyphQn8zUt7RldGj4=",
       "dev": true,
       "requires": {
         "has-flag": "2.0.0"
@@ -8962,7 +8962,7 @@
     "test-exclude": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-4.1.1.tgz",
-      "integrity": "sha512-35+Asrsk3XHJDBgf/VRFexPgh3UyETv8IAn/LRTiZjVy6rjPVqdEk8dJcJYBzl1w0XCJM48lvTy8SfEsCWS4nA==",
+      "integrity": "sha1-TYSWSwlmsAh+zDNKLOAC09k0HiY=",
       "dev": true,
       "requires": {
         "arrify": "1.0.1",
@@ -8999,7 +8999,7 @@
     "timers-browserify": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
-      "integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
+      "integrity": "sha1-lspT9LeUpefA4b18yIo3Ipj6AeY=",
       "dev": true,
       "requires": {
         "setimmediate": "1.0.5"
@@ -9195,7 +9195,7 @@
     "url-loader": {
       "version": "0.5.9",
       "resolved": "https://registry.npmjs.org/url-loader/-/url-loader-0.5.9.tgz",
-      "integrity": "sha512-B7QYFyvv+fOBqBVeefsxv6koWWtjmHaMFT6KZWti4KRw8YUD/hOU+3AECvXuzyVawIBx3z7zQRejXCDSO5kk1Q==",
+      "integrity": "sha1-zI/qgse5Bud3cBklCGnlaemVwpU=",
       "dev": true,
       "requires": {
         "loader-utils": "1.1.0",
@@ -9258,7 +9258,7 @@
     "uuid": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.1.0.tgz",
-      "integrity": "sha512-DIWtzUkw04M4k3bf1IcpS2tngXEL26YUD2M0tMDUpnUrz2hgzUBlD55a4FjdLGPvfHxS6uluGWvaVEqgBcVa+g==",
+      "integrity": "sha1-PdPT55Crwk17DToDT/q6vijrvAQ=",
       "dev": true
     },
     "validate-npm-package-license": {
@@ -9355,7 +9355,7 @@
     "vue-router": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-2.7.0.tgz",
-      "integrity": "sha512-kxgsT50dDExua3i103nxNBjlfk8LeUmO9iujVxXV42MnISINHUjqMrknpOOJEg+i9nEkoVgG8N86Pklze35c/A=="
+      "integrity": "sha1-FtQkSTqlHDyMzot8chDqTDqJr/E="
     },
     "vue-style-loader": {
       "version": "3.0.3",
@@ -9380,7 +9380,7 @@
     "vue-template-es2015-compiler": {
       "version": "1.5.3",
       "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.5.3.tgz",
-      "integrity": "sha512-j3TBDtjqz7pC9XUzeSeqF5oekqPahxyUHsdG+kZKDH/V/DTexq5inYdLGstnqCUljoLC9LTj3H/5hmyToeSd1A==",
+      "integrity": "sha1-Inh95ON+vZM5t0IjvEZ9Gt7jBUU=",
       "dev": true
     },
     "watchpack": {
@@ -9397,7 +9397,7 @@
     "webpack": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-2.7.0.tgz",
-      "integrity": "sha512-MjAA0ZqO1ba7ZQJRnoCdbM56mmFpipOPUv/vQpwwfSI42p5PVDdoiuK2AL2FwFUVgT859Jr43bFZXRg/LNsqvg==",
+      "integrity": "sha1-sqEiaAQ3P/09A+qca9UlBnA09rE=",
       "dev": true,
       "requires": {
         "acorn": "5.1.2",
@@ -9644,7 +9644,7 @@
     "webpack-sources": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-1.0.1.tgz",
-      "integrity": "sha512-05tMxipUCwHqYaVS8xc7sYPTly8PzXayRCB4dTxLhWTqlKUiwH6ezmEe0OSreL1c30LAuA3Zqmc+uEBUGFJDjw==",
+      "integrity": "sha1-xzVkNqTRMSO+LiQmoF0drZy+Zc8=",
       "dev": true,
       "requires": {
         "source-list-map": "2.0.0",
@@ -9660,7 +9660,7 @@
     "which": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/which/-/which-1.3.0.tgz",
-      "integrity": "sha512-xcJpopdamTuY5duC/KnTTNBraPK54YwpenP4lzxU8H91GudWpFv38u0CKjclE1Wi2EH2EDz5LRcHcKbCIzqGyg==",
+      "integrity": "sha1-/wS9/AEO5UfXgL7DjhrBwnd9JTo=",
       "dev": true,
       "requires": {
         "isexe": "2.0.0"
diff --git a/src/App.vue b/src/App.vue
index e73d5275..7bf687fc 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,24 +1,19 @@
 <template>
-  <div id="app">
-  	<nav class="navbar topo static-top fixed-top navbar-expand-lg container.fluid">
-        <div class = "navbar-header">
-          <a class="navbar-brand" href="#">
-            <img src = "./assets/Falko - Final .png" width="50" height="40"/>
-            <img src = "./assets/Falko - Texto.png" width="50" height="40"/>
-          </a>
-        </div>
-        <div class="form-inline pesquisa my-2 my-lg-0">
-          <input type="text" class="form-control" placeholder="Search">
-          <button class="btn btn-outline-success my-2 my-sm-0" type="submit">OK</button>
-        </div>
-    </nav>
+  <div>
+    <navbar></navbar>
     <router-view></router-view>
   </div>
 </template>
 
 <script>
+import Navbar from '@/components/Navbar.vue'
+
 export default {
-  name: 'app'
+  name: 'app',
+
+   components: {
+    navbar: Navbar
+  },
 }
 </script>
 
@@ -33,23 +28,8 @@ export default {
   margin-top: 100px;
 }
 
-.topo{
-  padding: 0.2%;
-  width: 100%;
-  background-color: #E8E8E8;
-}
-
 .navbar-brand{
-  left: 30em;
-  margin-left: 0.5em;
-  height: 100%;
-}
-
-.pesquisa{
-  position: fixed;
-  left: 40%;
-  right: 20%;
-  top : 0.45em;
+  margin-left: 1em;
 }
 
 .falko-button {
@@ -66,4 +46,19 @@ export default {
 .falko-button:hover {
   background-color: #86B1ED;
 }
+
+.falko-button-danger {
+  align-self: center;
+  margin: 0.5em 0;
+  border-radius: 2em;
+  padding: 0.5em 2em;
+  cursor: pointer;
+  background-color: #AA0000;
+  border-width: 0;
+  font-weight: bold;
+}
+
+.falko-button-danger:hover {
+  background-color: #660000;
+}
 </style>
\ No newline at end of file
diff --git a/src/assets/Falko - Final .png b/src/assets/Falko - Final .png
deleted file mode 100644
index 207222f5..00000000
Binary files a/src/assets/Falko - Final .png and /dev/null differ
diff --git a/src/assets/Falko - Texto.png b/src/assets/falko-text.png
similarity index 100%
rename from src/assets/Falko - Texto.png
rename to src/assets/falko-text.png
diff --git a/src/assets/github.png b/src/assets/github.png
new file mode 100644
index 00000000..acd5d242
Binary files /dev/null and b/src/assets/github.png differ
diff --git a/src/components/AddProject.vue b/src/components/AddProject.vue
index c3ad1be6..2910e50d 100644
--- a/src/components/AddProject.vue
+++ b/src/components/AddProject.vue
@@ -1,32 +1,34 @@
 <template>
-	<div class = "addproj">		
-		<button type="button" class="btn btn-info btn-md " id="addbutton" data-toggle="modal" data-target="#myModal">
-			Adicionar
-		</button>
+	<div class="addproj">		
+		<div class="text-center">
+			<button type="button" class="btn btn-info btn-md falko-button" id="addButton" data-toggle="modal" data-target="#myModal">
+				Add a Project
+			</button>
+		</div>
 
 		<div class="modal fade" id ="myModal" role="dialog">
 			<div class="modal-dialog">	
 		    	<div class="modal-content">
-			        <div class="modal-header">
-			          	<button type="button" class="close" data-dismiss="modal" aria-label="Fechar">
-			              <span aria-hidden="true">&times;</span>
-			            </button>
-			          <h4 class="modal-title">Adicionar projeto</h4>
-			        </div>
-			        <div class="modal-body">
-			              <p><label > Nome </label></p>
-			              <p><input type = "text" v-model="name"></input><br></p>
-			              <p><label> Descrição </label></p>
-			              <input type = "text" v-model="description"></input><br>
-			        </div>
-			        <div class="modal-footer">
-			          <button type="button" class="btn btn-primary" v-on:click="addProject" data-dismiss="modal">Salvar</button>
-		        	  <button type="button" class="btn btn-secondary" data-dismiss="modal" >Fechar</button>	
-			        </div>
+						<div class="modal-header">
+							<h4 class="modal-title">Add a Project</h4>
+								<button type="button" class="close" data-dismiss="modal" aria-label="Fechar">
+									<span aria-hidden="true">&times;</span>
+								</button>
+						</div>
+						<div class="modal-body">
+							<p><label>Name</label></p>
+							<p><input type = "text" v-model="name"></input><br></p>
+							<p><label>Description</label></p>
+							<input type = "text" v-model="description"></input><br>
+						</div>
+						<div class="modal-footer">
+							<button type="button" class="btn btn-primary" v-on:click="addProject" data-dismiss="modal">Save</button>
+							<button type="button" class="btn btn-secondary" data-dismiss="modal" >Close</button>	
+						</div>
 				</div>
 			</div>
 		</div>																	
-    </div>
+	</div>
 </template>
 
 <script>
@@ -61,10 +63,21 @@ export default {
 }
 </script>
 
-<style >
+<style scoped>
+#addButton {
+	margin-top: 2em;
+}
+
 .modal-body{
   position: relative;
   top: 5px;
 }
 
+p {
+	margin-bottom: 0.5em;
+}
+
+label {
+	margin-bottom: 0em;
+}
 </style>
\ No newline at end of file
diff --git a/src/components/DeleteProject.vue b/src/components/DeleteProject.vue
index cd9f03cd..3fe6dddb 100644
--- a/src/components/DeleteProject.vue
+++ b/src/components/DeleteProject.vue
@@ -1,23 +1,25 @@
 <template>
-	<div class = "delproject">		
-		<button type="button" class="btn btn-info btn-md " id="deletebutton" data-toggle="modal" data-target="#myModal">
-			Deletar
+	<div class="delproject">		
+		<button type="button" class="btn btn-info btn-md falko-button-danger" id="deletebutton" data-toggle="modal" data-target="#myModal">
+			Delete
 		</button>	
 		<div class="modal fade" id ="myModal" role="dialog">
 			<div class="modal-dialog">	
 		    	<div class="modal-content">
 			        <div class="modal-header">
+									<div>
+			            	<h4 class="modal-title">Delete Project?</h4>
+									</div>
 			          	<button type="button" class="close" data-dismiss="modal" aria-label="Fechar">
 			              <span aria-hidden="true">&times;</span>
 			            </button>
-			            <h4 class="modal-title">Apagar Projeto</h4>
 			        </div>
 			        <div class="modal-body">
-			              <p><label > Você tem certeza que deseja fazer isso?</label></p>
+			          <p><label> Are you sure?</label></p>
 			        </div>
 			        <div class="modal-footer">
-            			<button v-on:click="delproje" type="button" class="btn btn-primary" data-dismiss="modal" >Sim</button>            			
-		        	  <button type="button" class="btn btn-secondary" data-dismiss="modal">Não</button>	
+            			<button v-on:click="delproje" type="button" class="btn btn-primary" data-dismiss="modal" >Yes</button>            			
+		        	  <button type="button" class="btn btn-secondary" data-dismiss="modal">No</button>	
 			        </div>
 				</div>
 			</div>
@@ -51,11 +53,4 @@ export default {
 
 <style scoped>
 
-#deletebutton {
-  position: fixed;
-  top: 40%;
-  width: 7em;
-  left: 38em;
-  resize: both;
-}
 </style>
\ No newline at end of file
diff --git a/src/components/EditProject.vue b/src/components/EditProject.vue
index e25e00dd..11e13a5a 100644
--- a/src/components/EditProject.vue
+++ b/src/components/EditProject.vue
@@ -1,7 +1,7 @@
 <template>
 	<div class = "editproject">		
-		<button type="button" class="btn btn-info btn-md " id="editbutton" data-toggle="modal" data-target="#editModal">
-			Editar
+		<button type="button" class="btn btn-info btn-md falko-button" id="editbutton" data-toggle="modal" data-target="#editModal">
+			Edit
 		</button>
 		
 		<div class="modal fade" id ="editModal" role="dialog">
@@ -11,17 +11,17 @@
 			          	<button type="button" class="close" data-dismiss="modal" aria-label="Fechar">
 			              <span aria-hidden="true">&times;</span>
 			            </button>
-			          <h4 class="modal-title">Editar projeto</h4>
+			          <h4 class="modal-title">Edit Project</h4>
 			        </div>
 			        <div class="modal-body">
-			              <p><label > Nome </label></p>
-			              <p><input type = "text" v-model="name"></input><br></p>
-			              <p><label> Descrição </label></p>
-			              <input type = "text" v-model="description"></input><br>
+								<p><label > Name </label></p>
+								<p><input type = "text" v-model="name"></input><br></p>
+								<p><label> Description </label></p>
+								<input type = "text" v-model="description"></input><br>
 			        </div>
 			        <div class="modal-footer">
-			          <button type="button" class="btn btn-primary" v-on:click="editProject" data-dismiss="modal">Salvar</button>
-		        	  <button type="button" class="btn btn-secondary" data-dismiss="modal" >Fechar</button>	
+			          <button type="button" class="btn btn-primary" v-on:click="editProject" data-dismiss="modal">Save</button>
+		        	  <button type="button" class="btn btn-secondary" data-dismiss="modal" >Close</button>	
 			        </div>
 				</div>
 			</div>
@@ -58,10 +58,4 @@
 </script>
 	
 <style scoped>
-	#editbutton{
-		position: fixed;
-		top: 40%;
-		resize: both;
-
-	}
 </style>
\ No newline at end of file
diff --git a/src/components/HomePage.vue b/src/components/HomePage.vue
index d3945e90..22b6801a 100644
--- a/src/components/HomePage.vue
+++ b/src/components/HomePage.vue
@@ -5,13 +5,10 @@
         <div class="row justify-content-around center-block no-margin">
           <div class="col-md-4 align-self-center">
             <h1>Start now!</h1>
-            <p class="white-description">
-              The Falko platform was designed with the focus on meeting the need for agile
-              project managers to track the productivity of teams and projects managed in a
-              more simplified way. The application aims to present the metrics established,
-              through the data collected in GitHub, as relevant information and compact
-              reports. Thus, it will centralize all the information necessary for the analysis
-              and decision making of the manager.
+            <p class="white-description">              
+              Falko was designed to fit the agile project managers needs. By 
+              giving the necessary tools to improve the <i>vision</i> and control 
+              about your teams, Falko helps you make the best choices.
             </p>
           </div>
 
@@ -25,14 +22,11 @@
       <div class="parallax">
         <div class="row justify-content-around center-block no-margin" id="sectionParallax">
           <div class="col-sm-5 align-self-center" id="loginComponent">
-            <h1>See beyond</h1>
+            <h1>Free Software</h1>
             <p class="white-description">
-              The Falko platform was designed with the focus on meeting the need for agile
-              project managers to track the productivity of teams and projects managed in a
-              more simplified way. The application aims to present the metrics established,
-              through the data collected in GitHub, as relevant information and compact
-              reports. Thus, it will centralize all the information necessary for the analysis
-              and decision making of the manager.
+              Falko is under the MIT license. What does that means? You can use it, 
+              download the source code, improve and do your own based custom software, 
+              and more! Feel free to contribute too!
             </p>
           </div>
 
@@ -43,28 +37,25 @@
       </div>
 
     <div class="" id="sectionDark">
-      <div class="row justify-content-center no-margin">
-        <div class="col-sm-4" align="center" id="registerComponent">
-          <login-register></login-register>
+      <div class="row justify-content-around no-margin">
+        <div class="col-sm-5 align-self-center" align="center">
+          <img src="../assets/github.png" class="img-fluid" width="400em" alt="Falko" id="falkoLogo" />
         </div>
 
         <div class="col-sm-6 align-self-center">
-          <h1>Another Lorem Ipsum</h1>
-          <p class="white-description">
-            The Falko platform was designed with the focus on meeting the need for agile
-            project managers to track the productivity of teams and projects managed in a
-            more simplified way. The application aims to present the metrics established,
-            through the data collected in GitHub, as relevant information and compact
-            reports. Thus, it will centralize all the information necessary for the analysis
-            and decision making of the manager.
-          </p>
+          <h1>See beyond</h1>
+            <p class="white-description">
+              All data comes from Github's API. Track your repositories, commits,
+              issues, branches with graphs and visual data.
+            </p>
         </div>
 
       </div>
     </div>
     <div class="card-footer" id="footer">
       <a>
-Copyright (c) 2017 Falko - UnB-FGA (GPP/MDS) Grupo 8 Segundo Semestre de 2017</a>
+        Copyright (c) 2017 Falko - UnB-FGA (GPP/MDS) Grupo 8 Segundo Semestre de 2017
+      </a>
     </div>
   </div>
 </template>
@@ -154,8 +145,7 @@ h1 {
 #footer {
   background-color: #01161E;
   margin: 0;
-  max-height: 3em;
-  font-size: smaller;
+  padding: 1.5em 0;
   color: #598392;
   font-size: 0.9rem;
   text-align: center;
diff --git a/src/components/InProject.vue b/src/components/InProject.vue
index 5996f763..a3d3c99f 100644
--- a/src/components/InProject.vue
+++ b/src/components/InProject.vue
@@ -4,17 +4,21 @@
 			<div class="col-md-10">
 				<div class="card aproject">
 					<div class="card-body ">
-						<div class="card-title">{{project.name}}</div>
-						<div class="card-text">{{project.description}}</div>
+						<h4 class="card-title">{{project.name}}</h4>
+						<p class="card-text text-muted">{{project.description}}</p>
 					</div>
 				</div>
-				<DelProject></DelProject>
-				<EditProject></EditProject>
 			</div>
 		</div>
-		
+        <div class="row justify-content-center" id="buttons">
+					<div class="col-md-2">
+          	<EditProject></EditProject>
+					</div>
+					<div class="col-md-2">
+				  	<DelProject></DelProject>
+					</div>
+        </div>
 	</div>
-
 </template>
 
 <script>
@@ -65,11 +69,13 @@ export default{
 
 	
 <style scoped>
+#buttons {
+	margin-top: 1em;
+}
 
 .aproject{
 	position: relative;
 	left: 5em;
 	text-align: center;
 }
-
 </style>
\ No newline at end of file
diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue
new file mode 100644
index 00000000..59fbb29b
--- /dev/null
+++ b/src/components/Navbar.vue
@@ -0,0 +1,16 @@
+<template>
+  <nav class="navbar sticky-top navbar-light bg-light">
+      <a class="navbar-brand" href="#">
+        <img src="logo.png" width="50"/>
+        <img src="../assets/falko-text.png" height="50"/>
+      </a>
+  </nav>
+</template>
+
+<script>
+export default {  
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/components/Projects.vue b/src/components/Projects.vue
index 1db7e884..b5b71a81 100644
--- a/src/components/Projects.vue
+++ b/src/components/Projects.vue
@@ -1,12 +1,14 @@
 <template>
   <div>   
     <div class="row top-buffer" v-for="i in Math.ceil(projects.length / 2)">
-      <div v-for="project in projects.slice((i-1) * 2,i*2)" class="col-md-6">
-        <router-link v-bind:to="'/inproject/'+project.id">
+      <div v-for="project in projects.slice((i-1) * 2,i*2)" class="col-md-6 text-center">
+        <router-link v-bind:to="'/inproject/'+project.id" class="asdf">
           <div class="card">
             <div class="card-body project">
-              <div class="card-title">{{project.name}}</div>
-              <div class="card-text">{{project.description}}</div>
+              <h4 class="card-title">
+                  {{project.name}}
+              </h4>
+              <p class="card-text text-muted">{{project.description}}</p>
             </div>
           </div>
         </router-link>
@@ -71,4 +73,13 @@ export default{
 .top-buffer {
   margin-top:30px; 
 }
+
+a:link {
+  text-decoration: none !important;
+  color: inherit;
+}
+
+a:hover {
+  font-weight: bold;
+}
 </style>