diff --git a/config/dev.env.js b/config/dev.env.js
index 09c3a6b..8adf251 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,7 +7,7 @@ module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   SESSION: '"http://fortress.sh/v1/sessions"',
   API_URL: '"http://fortress.sh/"',
-  API_TIMEOUT: '"4000"',
+  API_TIMEOUT: '"10000"',
   GITHUB_OAUTH: '"https://github.com/login/oauth/authorize?client_id=aa942c520baf3f84f67f&scope=admin:org_hook%20admin:repo_hook%20admin:public_key%20repo%20user"',
   SOCKET_URL: '"ws://fortress.sh"',
   SOCKET_PATH: '"/notifications"',
diff --git a/config/prod.env.js b/config/prod.env.js
index e10529e..54984eb 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -5,7 +5,7 @@ module.exports = {
   NODE_ENV: '"production"',
   SESSION: '"http://fortress.sh/v1/sessions"',
   API_URL: '"http://fortress.sh/"',
-  API_TIMEOUT: '"4000"',
+  API_TIMEOUT: '"10000"',
   GITHUB_OAUTH: '"https://github.com/login/oauth/authorize?client_id=aa942c520baf3f84f67f&scope=admin:org_hook%20admin:repo_hook%20admin:public_key%20repo%20user"',
   SOCKET_URL: '"wss://fortress.sh"',
   SOCKET_PATH: '"/notifications"',
diff --git a/config/test.env.js b/config/test.env.js
index 3e10b39..b39a265 100644
--- a/config/test.env.js
+++ b/config/test.env.js
@@ -6,7 +6,7 @@ module.exports = merge(devEnv, {
   NODE_ENV: '"testing"',
   SESSION: '"http://api.fortress.sh/v1/sessions"',
   API_URL: '"http://api.fortress.sh/"',
-  API_TIMEOUT: '"4000"',
+  API_TIMEOUT: '"10000"',
   GITHUB_OAUTH: '"https://github.com/login/oauth/authorize?client_id=aa942c520baf3f84f67f&scope=admin:org_hook%20admin:repo_hook%20admin:public_key%20repo%20user"',
   SOCKET_URL: '"ws://websockets.fortress.sh"',
   SOCKET_PATH: '"/notifications"',
diff --git a/src/components/builds/build-item.vue b/src/components/builds/build-item.vue
index 01b48f8..17d53a9 100644
--- a/src/components/builds/build-item.vue
+++ b/src/components/builds/build-item.vue
@@ -5,17 +5,19 @@
     <article class="media">
         <div class="media-left">
           <figure class="image is-64x64">
-            <img v-if="status == 'success'"
+            <img v-if="status == 'successful'"
               src="/static/success.svg">
-            <img v-else-if="status == 'failure'"
+            <img v-else-if="status == 'failed'"
               src="/static/exclamation-mark.svg">
             <img v-else-if="status == 'running'"
               src="/static/running.svg">
-            <img v-else-if="status == 'maintenance'"
+            <img v-else-if="status == 'maintenanced'"
               src="/static/fence.svg">
             <img v-else-if="status == 'created'"
               src="/static/new.svg">
             <img v-else-if="status == 'scheduled'"
+              src="/static/queue.svg">
+            <img v-else-if="status == 'timeouted'"
               src="/static/scheduled.svg">
             <img v-else
               src="/static/fence.svg">
@@ -24,9 +26,9 @@
         <div class="media-content">
           <div class="content">
             <p class="fsh-elipsis">
-              <strong>{{ branch }}</strong>
+              <strong>{{ branch }} # {{ commit }} # {{ id }}</strong>
               <br>
-              <small>1 hour ago</small>
+              <small>{{ createdAtFromNow }}</small>
             </p>
           </div>
         </div>
@@ -35,6 +37,7 @@
 </template>
 <script>
 import { mapGetters, mapActions } from 'vuex';
+import moment from 'moment';
 
 export default {
   created() {
@@ -45,6 +48,9 @@ export default {
   },
   computed: {
     ...mapGetters('socket', ['connection']),
+    createdAtFromNow() {
+      return moment(this.createdAt).fromNow();
+    },
   },
   methods: {
     ...mapActions('builds', ['update']),
@@ -53,6 +59,8 @@ export default {
     status: String,
     id: Number,
     branch: String,
+    createdAt: String,
+    commit: String,
   },
 };
 </script>
diff --git a/src/components/builds/build-page.vue b/src/components/builds/build-page.vue
index 980a7cf..65b1b33 100644
--- a/src/components/builds/build-page.vue
+++ b/src/components/builds/build-page.vue
@@ -1,8 +1,8 @@
 <template>
-  <div id="build-page">
+  <div id="build-page" v-if="!isBuildLoading && !isLogsLoading">
     <br>
     <div class="content">
-      <pre :class="buildStatusClassName">{{ logs || '...' }}</pre>
+      <pre width="80" :class="buildStatusClassName">{{ logs || '...' }}</pre>
     </div>
   </div>
 </template>
@@ -12,13 +12,17 @@ import { mapState, mapActions, mapGetters } from 'vuex';
 export default {
   created() {
     const projectId = this.$route.params.project_id;
-    const buildId = this.$route.params.id;
-    this.prefetch({
+    const id = this.$route.params.id;
+    this.prefetchLogs({
       projectId,
-      buildId,
+      id,
     });
-    this.updateBuildEvent = `builds:${buildId}:update`;
-    this.newLogEvent = `logs:${buildId}:new`;
+    this.prefetchBuild({
+      projectId,
+      id,
+    });
+    this.updateBuildEvent = `builds:${id}:update`;
+    this.newLogEvent = `logs:${id}:new`;
     this.connection.on(this.newLogEvent, this.log.bind(this));
     this.connection.on(this.updateBuildEvent, this.update.bind(this));
   },
@@ -30,27 +34,36 @@ export default {
     ...mapGetters('socket', [
       'connection',
     ]),
-    ...mapState('build', [
-      'status',
-    ]),
-    ...mapGetters('build', [
-      'logs',
-    ]),
+    ...mapState('build', {
+      build: 'build',
+      isBuildLoading: 'isLoading',
+    }),
+    ...mapState('log', {
+      isLogsLoading: 'isLoading',
+    }),
+    ...mapGetters('log', {
+      logs: 'logs',
+    }),
     buildStatusClassName() {
+      const { status } = this.build;
       return {
-        'fsh-build-success': this.status === 'success',
-        'fsh-build-failure': ['failure', 'maintenance'].includes(this.status),
-        'fsh-build-primary': ['created', 'scheduled'].includes(this.status),
-        'fsh-build-running': this.status === 'running',
+        'fsh-build-success': status === 'successful',
+        'fsh-build-failure': ['failed', 'maintenance'].includes(status),
+        'fsh-build-primary': ['created', 'scheduled', 'timeouted']
+          .includes(status),
+        'fsh-build-running': status === 'running',
       };
     },
   },
   methods: {
-    ...mapActions('build', [
-      'log',
-      'prefetch',
-      'update',
-    ]),
+    ...mapActions('log', {
+      prefetchLogs: 'prefetch',
+      log: 'log',
+    }),
+    ...mapActions('build', {
+      prefetchBuild: 'prefetch',
+      update: 'update',
+    }),
   },
 };
 </script>
@@ -67,4 +80,11 @@ export default {
   .fsh-build-running {
     border-top: 5px solid #8080f2;
   }
+  pre {
+    white-space: -moz-pre-wrap; /* Mozilla, supported since 1999 */
+    white-space: -pre-wrap; /* Opera */
+    white-space: -o-pre-wrap; /* Opera */
+    white-space: pre-wrap; /* CSS3 - Text module (Candidate Recommendation) http://www.w3.org/TR/css3-text/#white-space */
+    word-wrap: break-word; /* IE 5.5+ */
+  }
 </style>
diff --git a/src/components/builds/builds-page.vue b/src/components/builds/builds-page.vue
index c7d2cb2..91bc792 100644
--- a/src/components/builds/builds-page.vue
+++ b/src/components/builds/builds-page.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="builds-page">
+  <div id="builds-page" v-if="!isLoading">
     <br>
     <div v-if="builds.length" class="columns is-multiline">
       <div class="column is-12"
@@ -9,6 +9,8 @@
           :id="build.id"
           :branch="build.branch"
           :status="build.status"
+          :createdAt="build.created_at"
+          :commit="build.commit"
           ></build-item>
       </div>
     </div>
@@ -37,6 +39,7 @@ export default {
   computed: {
     ...mapState('builds', [
       'builds',
+      'isLoading',
     ]),
     ...mapGetters('socket', [
       'connection',
diff --git a/src/components/dashboard/dashboard-header.vue b/src/components/dashboard/dashboard-header.vue
index da8efb5..6f19d84 100644
--- a/src/components/dashboard/dashboard-header.vue
+++ b/src/components/dashboard/dashboard-header.vue
@@ -74,6 +74,9 @@ export default {
     ...mapState('build', {
       isBuildLoading: 'isLoading',
     }),
+    ...mapState('log', {
+      isLogLoading: 'isLoading',
+    }),
     isLogoutLoadingClass() {
       return {
         'is-loading': this.isLogoutLoading ||
@@ -81,7 +84,8 @@ export default {
           this.isSubscriptionsLoading ||
           this.isBuildsLoading ||
           this.isBuildLoading ||
-          this.isProjectLoading,
+          this.isProjectLoading ||
+          this.isLogLoading,
       };
     },
   },
diff --git a/src/components/pricing/pricing-page.vue b/src/components/pricing/pricing-page.vue
deleted file mode 100644
index 013629a..0000000
--- a/src/components/pricing/pricing-page.vue
+++ /dev/null
@@ -1,48 +0,0 @@
-<!-- <div class="container">
-      <p class="container ">
-        <h1 class="title is-1 is-spaced has-text-centered">
-          <strong class="fsh-primary">Pricing</strong>
-        </h1>
-      </p>
-      <div class="pricing-table">
-      <div class="pricing-plan">
-        <div class="plan-header">Free</div>
-        <div class="plan-price">
-            <span class="plan-price-amount"><span class="plan-price-currency">$</span>0</span>/month</div>
-        <div class="plan-items">
-          <div class="plan-item">1 VM</div>
-          <div class="plan-item">100 Minutes</div>
-          <div class="plan-item">10GB Storage</div>
-        </div>
-        <div class="plan-footer">
-          <button class="button is-fullwidth">Choose</button>
-        </div>
-      </div>
-
-      <div class="pricing-plan is-active">
-        <div class="plan-header">Growing Team</div>
-        <div class="plan-price"><span class="plan-price-amount"><span class="plan-price-currency">$</span>10</span>/month</div>
-        <div class="plan-items">
-          <div class="plan-item">2 VMs</div>
-          <div class="plan-item">1000 Minutes</div>
-          <div class="plan-item">20GB Storage</div>
-        </div>
-        <div class="plan-footer">
-          <button class="button is-fullwidth" disabled>Choose</button>
-        </div>
-      </div>
-
-      <div class="pricing-plan is-danger">
-        <div class="plan-header">Enterprise</div>
-        <div class="plan-price"><span class="plan-price-amount"><span class="plan-price-currency">$</span>100</span>/month</div>
-        <div class="plan-items">
-          <div class="plan-item">Custom VMs number</div>
-          <div class="plan-item">As much as you want</div>
-          <div class="plan-item">100GB Storage</div>
-        </div>
-        <div class="plan-footer">
-          <button class="button is-fullwidth" disabled>Choose</button>
-        </div>
-      </div>
-    </div>
-    </div> -->
diff --git a/src/store/index.js b/src/store/index.js
index a782fd7..0b8f89b 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -5,6 +5,7 @@ import authentication from './modules/authentication';
 import projects from './modules/projects';
 import project from './modules/project';
 import subscriptions from './modules/subscriptions';
+import log from './modules/log';
 import build from './modules/build';
 import builds from './modules/builds';
 
@@ -17,6 +18,7 @@ export default new Vuex.Store({
     authentication,
     project,
     subscriptions,
+    log,
     build,
     builds,
   },
diff --git a/src/store/modules/build.js b/src/store/modules/build.js
index 23bb624..b10d48f 100644
--- a/src/store/modules/build.js
+++ b/src/store/modules/build.js
@@ -1,70 +1,53 @@
 import HTTP from '@/api';
 
 const initialState = {
-  logs: [],
-  status: null,
+  build: null,
+  status: 'created',
   isLoading: false,
   isError: false,
   error: null,
 };
 
-const PREFETCH = 'PREFETCH';
-const PREFETCH_SUCCESS = 'PREFETCH_SUCCESS';
-const PREFETCH_FAILURE = 'PREFETCH_FAILURE';
-const LOG = 'LOG';
-const UPDATE = 'UPDATE';
+const BUILD_PREFETCH = 'BUILD_PREFETCH';
+const BUILD_PREFETCH_SUCCESS = 'BUILD_PREFETCH_SUCCESS';
+const BUILD_PREFETCH_FAILURE = 'BUILD_PREFETCH_FAILURE';
+const UPDATE_BUILD = 'UPDATE_BUILD';
 
 const mutations = {
-  [PREFETCH](state) {
+  [BUILD_PREFETCH](state) {
     state.isLoading = true;
     state.isError = false;
     state.error = null;
-    state.logs = [];
-    state.status = 'created';
+    state.build = null;
   },
-  [PREFETCH_SUCCESS](state, build) {
+  [BUILD_PREFETCH_SUCCESS](state, build) {
     state.isLoading = false;
     state.isError = false;
     state.error = null;
-    state.logs = build.logs;
-    state.status = build.status;
+    state.build = build;
   },
-  [PREFETCH_FAILURE](state, error) {
+  [BUILD_PREFETCH_FAILURE](state, error) {
     state.isLoading = false;
     state.isError = true;
     state.error = error;
   },
-  [UPDATE](state, payload) {
+  [UPDATE_BUILD](state, payload) {
     state.status = payload.status;
   },
-  [LOG](state, payload) {
-    state.logs.push(payload);
-  },
 };
 
 const actions = {
-  prefetch({ commit }, { projectId, buildId }) {
-    commit(PREFETCH);
-    HTTP.get(`/v1/projects/${projectId}/builds/${buildId}/logs`)
-      .then(response => response.data.logs)
-      .then(logs => commit(PREFETCH_SUCCESS, logs))
-      .catch(error => commit(PREFETCH_FAILURE, error));
+  prefetch({ commit }, { projectId, id }) {
+    commit(BUILD_PREFETCH);
+    /* eslint-disable */
+    console.log('fuck');
+    HTTP.get(`/v1/projects/${projectId}/builds/${id}`)
+      .then(response => response.data.build)
+      .then(build => commit(BUILD_PREFETCH_SUCCESS, build))
+      .catch(error => commit(BUILD_PREFETCH_FAILURE, error));
   },
   update({ commit }, payload) {
-    commit(UPDATE, payload);
-  },
-  log({ commit }, payload) {
-    commit(LOG, payload);
-  },
-};
-
-const sortByPosition = (a, b) => a.position - b.position;
-
-const getters = {
-  logs(state) {
-    return state.logs.concat()
-      .sort(sortByPosition)
-      .reduce((a, c) => a + c.content, '');
+    commit(UPDATE_BUILD, payload);
   },
 };
 
@@ -73,5 +56,4 @@ export default {
   state: initialState,
   actions,
   mutations,
-  getters,
 };
diff --git a/src/store/modules/builds.js b/src/store/modules/builds.js
index aca2bd5..119514a 100644
--- a/src/store/modules/builds.js
+++ b/src/store/modules/builds.js
@@ -32,7 +32,7 @@ const mutations = {
     state.builds = [];
   },
   [ADD_BUILD](state, build) {
-    state.builds.push(build);
+    state.builds.unshift(build);
   },
   [EDIT_BUILD](state, payload) {
     const findById = build => build.id === payload.id;
diff --git a/src/store/modules/log.js b/src/store/modules/log.js
new file mode 100644
index 0000000..7c5874a
--- /dev/null
+++ b/src/store/modules/log.js
@@ -0,0 +1,68 @@
+import HTTP from '@/api';
+
+const initialState = {
+  logs: [],
+  status: 'created',
+  isLoading: false,
+  isError: false,
+  error: null,
+};
+
+const PREFETCH = 'PREFETCH';
+const PREFETCH_SUCCESS = 'PREFETCH_SUCCESS';
+const PREFETCH_FAILURE = 'PREFETCH_FAILURE';
+const LOG = 'LOG';
+
+const mutations = {
+  [PREFETCH](state) {
+    state.isLoading = true;
+    state.isError = false;
+    state.error = null;
+    state.logs = [];
+  },
+  [PREFETCH_SUCCESS](state, logs) {
+    state.isLoading = false;
+    state.isError = false;
+    state.error = null;
+    state.logs = logs;
+  },
+  [PREFETCH_FAILURE](state, error) {
+    state.isLoading = false;
+    state.isError = true;
+    state.error = error;
+  },
+  [LOG](state, payload) {
+    state.logs.push(payload);
+  },
+};
+
+const actions = {
+  prefetch({ commit }, { projectId, id }) {
+    commit(PREFETCH);
+    HTTP.get(`/v1/projects/${projectId}/builds/${id}/logs`)
+      .then(response => response.data.logs)
+      .then(logs => commit(PREFETCH_SUCCESS, logs))
+      .catch(error => commit(PREFETCH_FAILURE, error));
+  },
+  log({ commit }, payload) {
+    commit(LOG, payload);
+  },
+};
+
+const sortByPosition = (a, b) => a.position - b.position;
+
+const getters = {
+  logs(state) {
+    return state.logs.concat()
+      .sort(sortByPosition)
+      .reduce((a, c) => a + c.content, '');
+  },
+};
+
+export default {
+  namespaced: true,
+  state: initialState,
+  actions,
+  mutations,
+  getters,
+};
diff --git a/static/queue.svg b/static/queue.svg
new file mode 100644
index 0000000..4e07551
--- /dev/null
+++ b/static/queue.svg
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 19.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 512.001 512.001" style="enable-background:new 0 0 512.001 512.001;" xml:space="preserve">
+<path style="fill:#EE5B55;" d="M436.155,69.186l-68.88,237.254c-7.052,24.291-21.47,45.158-41.696,60.347
+	c-20.225,15.188-44.286,23.217-69.579,23.217s-49.354-8.028-69.579-23.217c-20.226-15.189-34.644-36.057-41.696-60.347
+	L75.845,69.186c-2.31-7.956,2.268-16.278,10.223-18.587c7.957-2.311,16.277,2.268,18.587,10.223l68.88,237.254
+	c10.586,36.462,44.497,61.928,82.464,61.928s71.878-25.466,82.464-61.928l68.88-237.254c2.31-7.955,10.629-12.531,18.587-10.223
+	C433.888,52.909,438.465,61.231,436.155,69.186z"/>
+<path style="fill:#FFC261;" d="M141.696,55c0,23.317-14.517,43.231-35,51.233V500h-40V106.233c-20.483-8.003-35-27.916-35-51.233
+	c0-30.376,24.624-55,55-55S141.696,24.624,141.696,55z M480.304,55c0-30.376-24.624-55-55-55s-55,24.624-55,55
+	c0,23.317,14.517,43.231,35,51.233V500h40V106.233C465.787,98.231,480.304,78.317,480.304,55z"/>
+<path style="fill:#F3B05F;" d="M108.03,86c10.495,0,20.301-2.942,28.644-8.042C127.973,96.866,108.875,110,86.696,110v390h-20
+	V106.233c-20.483-8.003-35-27.916-35-51.233c0-19.881,10.55-37.296,26.356-46.958C54.836,15.031,53.03,22.802,53.03,31
+	C53.03,61.376,77.654,86,108.03,86z M446.637,86c-30.376,0-55-24.624-55-55c0-8.198,1.807-15.969,5.022-22.958
+	C380.854,17.704,370.304,35.119,370.304,55c0,23.317,14.517,43.231,35,51.233V500h20V110c22.178,0,41.277-13.134,49.978-32.042
+	C466.938,83.058,457.132,86,446.637,86z"/>
+<path style="fill:#EA744F;" d="M496.989,512h-143.37c-10.238,0-17.468-10.03-14.23-19.743l0,0
+	c2.042-6.125,7.774-10.257,14.23-10.257h19.09c-10.238,0-17.468-10.03-14.23-19.743l0,0c2.042-6.125,7.774-10.257,14.23-10.257
+	H477.9c6.456,0,12.188,4.131,14.23,10.257l0,0C495.368,471.97,488.138,482,477.9,482h19.09c6.456,0,12.188,4.131,14.23,10.257l0,0
+	C514.456,501.97,507.227,512,496.989,512z M172.611,492.257c-2.042-6.125-7.774-10.257-14.23-10.257h-19.09
+	c10.238,0,17.468-10.03,14.23-19.743l0,0c-2.042-6.125-7.774-10.257-14.23-10.257H34.101c-6.456,0-12.189,4.131-14.23,10.257l0,0
+	C16.633,471.97,23.863,482,34.101,482h-19.09c-6.456,0-12.189,4.131-14.23,10.257l0,0C-2.456,501.97,4.773,512,15.012,512h143.37
+	C168.62,512,175.849,501.97,172.611,492.257L172.611,492.257z"/>
+<path style="fill:#F4925A;" d="M153.522,110.257C156.76,119.97,149.53,130,139.292,130H34.101c-10.238,0-17.468-10.03-14.23-19.743
+	l0,0C21.913,104.131,27.645,100,34.101,100h105.191C145.748,100,151.48,104.131,153.522,110.257L153.522,110.257z M372.708,130
+	h105.191c10.238,0,17.468-10.03,14.23-19.743l0,0c-2.042-6.125-7.774-10.257-14.23-10.257H372.708
+	c-6.456,0-12.188,4.131-14.23,10.257l0,0C355.24,119.97,362.47,130,372.708,130z M492.129,462.257
+	c-2.042-6.125-7.774-10.257-14.23-10.257H372.708c-6.456,0-12.188,4.131-14.23,10.257l0,0C355.24,471.97,362.47,482,372.708,482
+	h105.191C488.137,482,495.367,471.97,492.129,462.257L492.129,462.257z M153.522,462.257c-2.042-6.125-7.774-10.257-14.23-10.257
+	H34.101c-6.456,0-12.189,4.131-14.23,10.257l0,0C16.633,471.97,23.863,482,34.101,482h105.191
+	C149.53,482,156.76,471.97,153.522,462.257L153.522,462.257z"/>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+<g>
+</g>
+</svg>