diff --git a/components/Buttons/UpdateButton.js b/components/Buttons/UpdateButton.js
index 59cacceea..3894a5328 100644
--- a/components/Buttons/UpdateButton.js
+++ b/components/Buttons/UpdateButton.js
@@ -1,7 +1,6 @@
 import React, { PropTypes } from 'react';
 import cx from 'classnames';
-import store from '../../core/store';
-import { fetchWebuiVersionUpdate } from '../../core/actions';
+import { updateWebuiAsync } from '../../core/actions';
 
 class UpdateButton extends React.Component {
   static propTypes = {
@@ -14,8 +13,7 @@ class UpdateButton extends React.Component {
   }
 
   handleClick() {
-    let state = store.getState();
-    store.dispatch(fetchWebuiVersionUpdate(state.activeApiKey));
+    updateWebuiAsync();
   }
 
   render() {
diff --git a/components/Layout/Header.js b/components/Layout/Header.js
index 3bd1a4afb..89fff60a1 100644
--- a/components/Layout/Header.js
+++ b/components/Layout/Header.js
@@ -9,6 +9,7 @@ import SidebarToggle from '../Buttons/SidebarToggle';
 import UpdateButton from '../Buttons/UpdateButton';
 import Notifications from './Notifications';
 
+
 class Header extends React.Component {
   render() {
     const { countHasher, countGeneral, countImages, autoUpdate, sidebarToggle, updateAvailable } = this.props;
@@ -24,7 +25,6 @@ class Header extends React.Component {
               <UpdateButton enabled={updateAvailable} />
             </ul>
           </div>
-
           <div className="nav notifications pull-right">
             <ul className="nav">
               <Notifications/>
diff --git a/core/actions.js b/core/actions.js
index 2e3913642..80e6a3ac3 100644
--- a/core/actions.js
+++ b/core/actions.js
@@ -1,433 +1,85 @@
 import 'isomorphic-fetch';
 import store from './store';
+import { createAction } from 'redux-actions';
 
 export const STATUS_INVALIDATE = 'STATUS_INVALIDATE';
 export const STATUS_REQUEST = 'STATUS_REQUEST';
 export const STATUS_RECEIVE = 'STATUS_RECEIVE';
 
-export const SET_APIKEY = 'SET_APIKEY';
-
-export function setApiKey(apiKey) {
-    return {
-        type: SET_APIKEY,
-        key: apiKey
-    }
-}
-
-export const SET_AUTOUPDATE = 'SET_AUTOUPDATE';
-
-export function setAutoupdate(status) {
-    return {
-        type: SET_AUTOUPDATE,
-        state: status
-    }
-}
-
-export const SIDEBAR_TOGGLE = 'SIDEBAR_TOGGLE';
-
-export function toggleSidebar(status) {
-    return {
-        type: SIDEBAR_TOGGLE,
-        state: status
-    }
-}
-
-export function autoUpdateTick() {
-    const state = store.getState();
-    store.dispatch(fetchQueues(state.activeApiKey));
-}
-
-export const QUEUE_STATUS = 'QUEUE_STATUS';
-export function invalidateQueues() {
-    return {
-        type: QUEUE_STATUS,
-        status: STATUS_INVALIDATE
-    }
-}
-export function requestQueues() {
-    return {
-        type: QUEUE_STATUS,
-        status: STATUS_REQUEST
-    }
-}
-
-export function receiveQueues(json) {
-    return {
-        type: QUEUE_STATUS,
-        status: STATUS_RECEIVE,
-        items: json,
-        receivedAt: Date.now()
-    }
-}
-
-export function fetchQueues(apiKey) {
-    return function (dispatch) {
-        dispatch(requestQueues());
+function createAsyncAction(type, key, apiAction) {
+    return () => {
+        const state = store.getState();
+        const status = state[key];
+        const apiKey = state.activeApiKey;
+        let shouldFetch;
+
+        if (!status) {
+            shouldFetch = true;
+        } else if (status.isFetching) {
+            shouldFetch = false;
+        } else {
+            shouldFetch = status.didInvalidate;
+        }
 
-        return fetch('/api/queue/get', {
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-                'apikey': apiKey
-            }
-        })
-        .then(response => response.json())
-        .then(json =>
-            dispatch(receiveQueues(json))
-        )
-        .catch(function (ex) {
-            console.log('parsing failed', ex)
-        });
-    }
-}
+        if (shouldFetch) {
+            store.dispatch(createAction(type, payload => payload, ()=>({status: STATUS_REQUEST}))());
+
+            return fetch('/api' + apiAction, {
+                headers: {
+                    'Accept': 'application/json',
+                    'Content-Type': 'application/json',
+                    'apikey': apiKey
+                }
+            })
+              .then(response => response.json())
+              .then(json =>
+                store.dispatch(createAction(type, payload => payload, ()=>({status: STATUS_RECEIVE, receivedAt: Date.now()}))(json))
+              )
+              .catch(function (ex) {
+                  console.log('parsing failed', ex)
+              });
 
-function shouldFetchQueues(state) {
-    const status = state.queues;
-    if (!status) {
-        return true
-    } else if (status.isFetching) {
-        return false
-    } else {
-        return status.didInvalidate
-    }
-}
-
-export function fetchQueuesIfNeeded() {
-    return (dispatch, getState) => {
-        if (shouldFetchQueues(getState())) {
-            return dispatch(fetchQueues())
         } else {
             return Promise.resolve()
         }
     }
 }
 
-export const RECENT_FILES = 'RECENT_FILES';
-
-export function invalidateRecentFiles() {
-    return {
-        type: RECENT_FILES,
-        status: STATUS_INVALIDATE
-    }
-}
-
-export function requestRecentFiles() {
-    return {
-        type: RECENT_FILES,
-        status: STATUS_REQUEST
-    }
-}
-
-export function receiveRecentFiles(json) {
-    return {
-        type: RECENT_FILES,
-        status: STATUS_RECEIVE,
-        items: json,
-        receivedAt: Date.now()
-    }
-}
-
-export function fetchRecentFiles(apiKey) {
-    return function (dispatch) {
-        dispatch(requestRecentFiles());
-        const { autoUpdate } = store.getState();
-
-        return fetch('/api/file/recent', {
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-                'apikey': apiKey
-            }
-        })
-          .then(response => response.json())
-          .then(json =>
-            dispatch(receiveRecentFiles(json))
-          )
-          .catch(function (ex) {
-              console.log('parsing failed', ex)
-          });
-    }
-}
+/* Sync actions */
+export const API_SESSION = 'API_SESSION';
+export const apiSession = createAction(API_SESSION);
+export const SET_APIKEY = 'SET_APIKEY';
+export const setApiKey = createAction(SET_APIKEY);
+export const SIDEBAR_TOGGLE = 'SIDEBAR_TOGGLE';
+export const toggleSidebar = createAction(SIDEBAR_TOGGLE);
 
+/* Async actions - API calls */
+export const QUEUE_STATUS = 'QUEUE_STATUS';
+export const queueStatusAsync = createAsyncAction(QUEUE_STATUS,'queueStatus','/queue/get');
+export const RECENT_FILES = 'RECENT_FILES';
+export const recentFilesAsync = createAsyncAction(RECENT_FILES,'recentFiles','/file/recent');
 export const JMM_NEWS = 'JMM_NEWS';
-
-export function invalidateJmmNews() {
-    return {
-        type: JMM_NEWS,
-        status: STATUS_INVALIDATE
-    }
-}
-
-export function requestJmmNews() {
-    return {
-        type: JMM_NEWS,
-        status: STATUS_REQUEST
-    }
-}
-
-export function receiveJmmNews(json) {
-    return {
-        type: JMM_NEWS,
-        status: STATUS_RECEIVE,
-        items: json,
-        receivedAt: Date.now()
-    }
-}
-
-export function fetchJmmNews(apiKey) {
-    return function (dispatch) {
-        dispatch(requestJmmNews());
-
-        return fetch('/api/news/get', {
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-                'apikey': apiKey
-            }
-        })
-          .then(response => response.json())
-          .then(json => dispatch(receiveJmmNews(json)))
-          .catch(function (ex) {
-              console.log('parsing failed', ex)
-          });
-    }
-}
-
+export const jmmNewsAsync = createAsyncAction(JMM_NEWS,'jmmNews','/news/get');
 export const IMPORT_FOLDERS = 'IMPORT_FOLDERS';
-
-export function invalidateImportFolders() {
-    return {
-        type: IMPORT_FOLDERS,
-        status: STATUS_INVALIDATE
-    }
-}
-
-export function requestImportFolders() {
-    return {
-        type: IMPORT_FOLDERS,
-        status: STATUS_REQUEST
-    }
-}
-
-export function receiveImportFolders(json) {
-    return {
-        type: IMPORT_FOLDERS,
-        status: STATUS_RECEIVE,
-        items: json,
-        receivedAt: Date.now()
-    }
-}
-
-export function fetchImportFolders(apiKey) {
-    return function (dispatch) {
-        dispatch(requestImportFolders());
-
-        return fetch('/api/folder/list', {
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-                'apikey': apiKey
-            }
-        })
-          .then(response => response.json())
-          .then(json =>
-            dispatch(receiveImportFolders(json))
-          )
-          .catch(function (ex) {
-              console.log('parsing failed', ex)
-          });
-    }
-}
-
+export const importFoldersAsync = createAsyncAction(IMPORT_FOLDERS,'importFolders','/folder/list');
 export const SERIES_COUNT = 'SERIES_COUNT';
-
-export function invalidateSeriesCount() {
-    return {
-        type: SERIES_COUNT,
-        status: STATUS_INVALIDATE
-    }
-}
-
-export function requestSeriesCount() {
-    return {
-        type: SERIES_COUNT,
-        status: STATUS_REQUEST
-    }
-}
-
-export function receiveSeriesCount(json) {
-    return {
-        type: SERIES_COUNT,
-        status: STATUS_RECEIVE,
-        count: json.count,
-        receivedAt: Date.now()
-    }
-}
-
-export function fetchSeriesCount(apiKey) {
-    return function (dispatch) {
-        dispatch(requestSeriesCount());
-
-        return fetch('/api/serie/count', {
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-                'apikey': apiKey
-            }
-        })
-          .then(response => response.json())
-          .then(json =>
-            dispatch(receiveSeriesCount(json))
-          )
-          .catch(function (ex) {
-              console.log('parsing failed', ex)
-          });
-    }
-}
-
+export const seriesCountAsync = createAsyncAction(SERIES_COUNT,'seriesCount','/serie/count');
 export const FILES_COUNT = 'FILES_COUNT';
-
-export function invalidateFilesCount() {
-    return {
-        type: FILES_COUNT,
-        status: STATUS_INVALIDATE
-    }
-}
-
-export function requestFilesCount() {
-    return {
-        type: FILES_COUNT,
-        status: STATUS_REQUEST
-    }
-}
-
-export function receiveFilesCount(json) {
-    return {
-        type: FILES_COUNT,
-        status: STATUS_RECEIVE,
-        count: json.count,
-        receivedAt: Date.now()
-    }
-}
-
-export function fetchFilesCount(apiKey) {
-    return function (dispatch) {
-        dispatch(requestFilesCount());
-
-        return fetch('/api/file/count', {
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-                'apikey': apiKey
-            }
-        })
-          .then(response => response.json())
-          .then(json =>
-            dispatch(receiveFilesCount(json))
-          )
-          .catch(function (ex) {
-              console.log('parsing failed', ex)
-          });
-    }
-}
-
+export const filesCountAsync = createAsyncAction(FILES_COUNT,'fileCount','/file/count');
 export const UPDATE_AVAILABLE = 'UPDATE_AVAILABLE';
-
-export function requestUpdateAvailable() {
-    return {
-        type: UPDATE_AVAILABLE,
-        status: STATUS_REQUEST
-    }
-}
-
-export function receiveUpdateAvailable(json) {
-    return {
-        type: UPDATE_AVAILABLE,
-        status: STATUS_RECEIVE,
-        count: json.count,
-        receivedAt: Date.now()
-    }
-}
-
-export function fetchUpdateAvailable(apiKey) {
-    return function (dispatch) {
-        dispatch(requestUpdateAvailable());
-
-        return fetch('/api/webui/latest', {
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-                'apikey': apiKey
-            }
-        })
-          .then(response => response.json())
-          .then(json =>
-            dispatch(receiveUpdateAvailable(json))
-          )
-          .catch(function (ex) {
-              console.log('parsing failed', ex)
-          });
-    }
-}
-
-function shouldFetchUpdateAvailable(state) {
-    const status = state.updateAvailable;
-    if (!status) {
-        return true
-    } else if (status.isFetching) {
-        return false
-    } else if (status.lastUpdated) {
-        return false
-    } else {
-        return status.didInvalidate
-    }
-}
-
-export function fetchUpdateAvailableIfNeeded() {
-    return (dispatch, getState) => {
-        if (shouldFetchUpdateAvailable(getState())) {
-            return dispatch(fetchUpdateAvailable(getState().activeApiKey))
-        } else {
-            return Promise.resolve()
-        }
-    }
-}
-
+export const updateAvailableAsync = createAsyncAction(UPDATE_AVAILABLE,'updateAvailable','/webui/latest');
 export const WEBUI_VERSION_UPDATE = 'WEBUI_VERSION_UPDATE';
+export const updateWebuiAsync = createAsyncAction(WEBUI_VERSION_UPDATE,'webuiVersionUpdate','/webui/update');
 
-export function requestWebuiVersionUpdate() {
-    return {
-        type: WEBUI_VERSION_UPDATE,
-        status: STATUS_REQUEST
-    }
-}
-
-export function receiveWebuiVersionUpdate(json) {
+/* Timer */
+export const SET_AUTOUPDATE = 'SET_AUTOUPDATE';
+export function setAutoupdate(status) {
     return {
-        type: WEBUI_VERSION_UPDATE,
-        status: STATUS_RECEIVE,
-        count: json.count,
-        receivedAt: Date.now()
+        type: SET_AUTOUPDATE,
+        state: status
     }
 }
 
-export function fetchWebuiVersionUpdate(apiKey) {
-    return function (dispatch) {
-        dispatch(requestWebuiVersionUpdate());
-
-        return fetch('/api/webui/update', {
-            headers: {
-                'Accept': 'application/json',
-                'Content-Type': 'application/json',
-                'apikey': apiKey
-            }
-        })
-          .then(response => response.json())
-          .then(json =>
-            dispatch(receiveWebuiVersionUpdate(json))
-          )
-          .catch(function (ex) {
-              console.log('parsing failed', ex)
-          });
-    }
+export function autoUpdateTick() {
+    queueStatusAsync();
 }
\ No newline at end of file
diff --git a/core/reducers.js b/core/reducers.js
index d42171049..096c70abf 100644
--- a/core/reducers.js
+++ b/core/reducers.js
@@ -1,18 +1,10 @@
 import { combineReducers } from 'redux'
+import { handleAction } from 'redux-actions';
 import { QUEUE_STATUS, SET_APIKEY, SET_AUTOUPDATE, STATUS_INVALIDATE, STATUS_RECEIVE, STATUS_REQUEST, RECENT_FILES, JMM_NEWS, IMPORT_FOLDERS, SERIES_COUNT,
-  FILES_COUNT, SIDEBAR_TOGGLE, UPDATE_AVAILABLE, WEBUI_VERSION_UPDATE, autoUpdateTick } from './actions'
+  FILES_COUNT, SIDEBAR_TOGGLE, UPDATE_AVAILABLE, WEBUI_VERSION_UPDATE, API_SESSION, autoUpdateTick } from './actions'
 
 const VERSION = __VERSION__;
 
-function activeApiKey(state = '', action) {
-    switch (action.type) {
-        case SET_APIKEY:
-            return action.key;
-        default:
-            return state
-    }
-}
-
 function autoUpdate(state = {
     status: false,
     timer: null
@@ -34,22 +26,13 @@ function autoUpdate(state = {
     }
 }
 
-function sidebarToggle(state = true, action) {
-    switch (action.type) {
-        case SIDEBAR_TOGGLE:
-            return action.state;
-        default:
-            return state
-    }
-}
-
 function queueStatus(state = {
     isFetching: false,
-    didInvalidate: false,
+    didInvalidate: true,
     items: {}
 }, action) {
     if (action.type != QUEUE_STATUS) { return state; }
-    switch (action.status) {
+    switch (action.meta.status) {
         case STATUS_INVALIDATE:
             return Object.assign({}, state, {
                 didInvalidate: true
@@ -63,8 +46,8 @@ function queueStatus(state = {
             return Object.assign({}, state, {
                 isFetching: false,
                 didInvalidate: false,
-                items: action.items,
-                lastUpdated: action.receivedAt
+                items: action.payload,
+                lastUpdated: action.meta.receivedAt
             });
         default:
             return state
@@ -73,11 +56,11 @@ function queueStatus(state = {
 
 function recentFiles(state = {
     isFetching: false,
-    didInvalidate: false,
+    didInvalidate: true,
     items: {}
 }, action) {
     if (action.type != RECENT_FILES) { return state; }
-    switch (action.status) {
+    switch (action.meta.status) {
         case STATUS_INVALIDATE:
             return Object.assign({}, state, {
                 didInvalidate: true
@@ -91,8 +74,8 @@ function recentFiles(state = {
             return Object.assign({}, state, {
                 isFetching: false,
                 didInvalidate: false,
-                items: action.items,
-                lastUpdated: action.receivedAt
+                items: action.payload,
+                lastUpdated: action.meta.receivedAt
             });
         default:
             return state
@@ -101,11 +84,11 @@ function recentFiles(state = {
 
 function jmmNews(state = {
     isFetching: false,
-    didInvalidate: false,
+    didInvalidate: true,
     items: {}
 }, action) {
     if (action.type != JMM_NEWS) { return state; }
-    switch (action.status) {
+    switch (action.meta.status) {
         case STATUS_INVALIDATE:
             return Object.assign({}, state, {
                 didInvalidate: true
@@ -119,8 +102,8 @@ function jmmNews(state = {
             return Object.assign({}, state, {
                 isFetching: false,
                 didInvalidate: false,
-                items: action.items,
-                lastUpdated: action.receivedAt
+                items: action.payload,
+                lastUpdated: action.meta.receivedAt
             });
         default:
             return state
@@ -129,11 +112,11 @@ function jmmNews(state = {
 
 function importFolders(state = {
     isFetching: false,
-    didInvalidate: false,
+    didInvalidate: true,
     items: {}
 }, action) {
     if (action.type != IMPORT_FOLDERS) { return state; }
-    switch (action.status) {
+    switch (action.meta.status) {
         case STATUS_INVALIDATE:
             return Object.assign({}, state, {
                 didInvalidate: true
@@ -147,8 +130,8 @@ function importFolders(state = {
             return Object.assign({}, state, {
                 isFetching: false,
                 didInvalidate: false,
-                items: action.items,
-                lastUpdated: action.receivedAt
+                items: action.payload,
+                lastUpdated: action.meta.receivedAt
             });
         default:
             return state
@@ -157,11 +140,11 @@ function importFolders(state = {
 
 function seriesCount(state = {
     isFetching: false,
-    didInvalidate: false,
+    didInvalidate: true,
     count: 0
 }, action) {
     if (action.type != SERIES_COUNT) { return state; }
-    switch (action.status) {
+    switch (action.meta.status) {
         case STATUS_INVALIDATE:
             return Object.assign({}, state, {
                 didInvalidate: true
@@ -175,8 +158,8 @@ function seriesCount(state = {
             return Object.assign({}, state, {
                 isFetching: false,
                 didInvalidate: false,
-                count: action.count || 0,
-                lastUpdated: action.receivedAt
+                count: action.payload.count,
+                lastUpdated: action.meta.receivedAt
             });
         default:
             return state
@@ -185,11 +168,11 @@ function seriesCount(state = {
 
 function filesCount(state = {
     isFetching: false,
-    didInvalidate: false,
+    didInvalidate: true,
     count: 0
 }, action) {
     if (action.type != FILES_COUNT) { return state; }
-    switch (action.status) {
+    switch (action.meta.status) {
         case STATUS_INVALIDATE:
             return Object.assign({}, state, {
                 didInvalidate: true
@@ -203,8 +186,8 @@ function filesCount(state = {
             return Object.assign({}, state, {
                 isFetching: false,
                 didInvalidate: false,
-                count: action.count || 0,
-                lastUpdated: action.receivedAt
+                count: action.payload.count,
+                lastUpdated: action.meta.receivedAt
             });
         default:
             return state
@@ -217,7 +200,7 @@ function updateAvailable(state = {
     status: false
 }, action) {
     if (action.type != UPDATE_AVAILABLE) { return state; }
-    switch (action.status) {
+    switch (action.meta.status) {
         case STATUS_INVALIDATE:
             return Object.assign({}, state, {
                 didInvalidate: true
@@ -231,8 +214,8 @@ function updateAvailable(state = {
             return Object.assign({}, state, {
                 isFetching: false,
                 didInvalidate: false,
-                status: (VERSION.indexOf('.') !== -1 && action.version != VERSION),
-                lastUpdated: action.receivedAt
+                status: (VERSION.indexOf('.') !== -1 && action.payload.version != VERSION),
+                lastUpdated: action.meta.receivedAt
             });
         default:
             return state
@@ -245,7 +228,7 @@ function webuiVersionUpdate(state = {
     status: false
 }, action) {
     if (action.type != WEBUI_VERSION_UPDATE) { return state; }
-    switch (action.status) {
+    switch (action.meta.status) {
         case STATUS_INVALIDATE:
             return Object.assign({}, state, {
                 didInvalidate: true
@@ -259,15 +242,26 @@ function webuiVersionUpdate(state = {
             return Object.assign({}, state, {
                 isFetching: false,
                 didInvalidate: false,
-                status: action.status,
-                lastUpdated: action.receivedAt
+                status: action.payload,
+                lastUpdated: action.meta.receivedAt
             });
         default:
             return state
     }
 }
 
+const apiSession = handleAction(API_SESSION, (state,action) => {
+    return action.error?state:Object.assign({},state, action.payload);
+},{});
+const activeApiKey = handleAction(SET_APIKEY,(state,action) => {
+    return action.error?state:action.payload;
+},'');
+const sidebarToggle = handleAction(SIDEBAR_TOGGLE,(state,action) => {
+    return action.error?state:action.payload;
+},true);
+
 const rootReducer = combineReducers({
+    apiSession,
     activeApiKey,
     autoUpdate,
     queueStatus,
diff --git a/css/main.css b/css/main.css
index 66ee97307..106402b64 100644
--- a/css/main.css
+++ b/css/main.css
@@ -234,6 +234,11 @@ a.logo span {
     margin-top: 15px;
     margin-left: 92px;
 }
+.header .notifications.pull-right {
+    float: left;
+    margin-top: 15px;
+    margin-left: 10px;
+}
 
 .header .notifications li {
     float: left;
diff --git a/package.json b/package.json
index 8cc726d42..6b54094b6 100644
--- a/package.json
+++ b/package.json
@@ -63,7 +63,9 @@
     "postcss-nesting": "^2.3.1",
     "postcss-selector-matches": "^2.0.1",
     "postcss-selector-not": "^2.0.0",
+    "react-bootstrap": "^0.30.2",
     "react-hot-loader": "^3.0.0-beta.2",
+    "redux-actions": "^0.10.1",
     "redux-logger": "^2.6.1",
     "redux-thunk": "^2.1.0",
     "s3": "^4.4.0",
diff --git a/pages/login/index.js b/pages/login/index.js
index 35cc35baa..87c5cde81 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -1,9 +1,10 @@
 import React, {PropTypes} from 'react';
+import { connect } from 'react-redux';
 import s from './styles.css';
 import cx from 'classnames';
 import 'isomorphic-fetch';
 import store from '../../core/store';
-import { setApiKey } from '../../core/actions';
+import { setApiKey, apiSession, queueStatusAsync } from '../../core/actions';
 import history from '../../core/history';
 
 class LoginPage extends React.Component {
@@ -16,6 +17,22 @@ class LoginPage extends React.Component {
     componentDidMount() {
         const container = document.getElementById('app-container');
         container.style.height = '100%';
+
+        fetch('/api/version', {
+            headers: {
+                'Accept': 'application/json',
+                'Content-Type': 'application/json'
+            }
+        })
+          .then(response => response.json())
+          .then(json => {
+              let data = {};
+              for (let key in json) {
+                  if (json[key].name == 'jmmserver') { data.version = json[key].version; }
+              }
+              store.dispatch(apiSession(data))
+            }
+          )
     }
 
     handleKeyPress(e) {
@@ -48,6 +65,7 @@ class LoginPage extends React.Component {
     }
 
     render() {
+        const { version } = this.props;
         return (
             <div className={s['wrapper']}>
                 <div className={s['wrapper-inner']}>
@@ -55,7 +73,7 @@ class LoginPage extends React.Component {
                         <div className="row">
                             <div className={cx("col-md-3 col-md-offset-3", s['left-panel'])}>
                                 <h1>JMM Server</h1>
-                                <h4>3.7.0.1 (WebUI {__VERSION__})</h4>
+                                <h4>{version} (WebUI {__VERSION__})</h4>
                                 <h2>Welcome Back!</h2>
                                 <h2>Input your user information to login into JMM Server!</h2>
                             </div>
@@ -83,4 +101,12 @@ class LoginPage extends React.Component {
     }
 }
 
-export default LoginPage;
\ No newline at end of file
+function mapStateToProps(state) {
+    const { apiSession } = state;
+
+    return {
+        version: apiSession.version || null
+    }
+}
+
+export default connect(mapStateToProps)(LoginPage)
\ No newline at end of file
diff --git a/pages/main/News.js b/pages/main/News.js
index 9896c5890..631523a0f 100644
--- a/pages/main/News.js
+++ b/pages/main/News.js
@@ -14,7 +14,7 @@ class News extends React.Component {
     for (let key in items) {
       let item = items[key];
       i++;
-      news.push(<tr>
+      news.push(<tr key={i}>
         <td><a href={item.link} target="_blank">{item.title}</a></td>
         <td className="text-right">{item.date}</td>
       </tr>);
diff --git a/pages/main/RecentFiles.js b/pages/main/RecentFiles.js
index 0332ce25c..d65ab2c70 100644
--- a/pages/main/RecentFiles.js
+++ b/pages/main/RecentFiles.js
@@ -23,7 +23,7 @@ class RecentFiles extends React.Component {
                   <div className={s['text-wrapper']}>{item.path}</div>
                 </td>
                   <td className="text-right">
-                      <span className={cx("badge",item.success?"bg-success":"bg-important")}>Imported</span>
+                      <span className={cx("badge",item.success?"bg-success":"bg-important")}>{item.success?"Imported":"Error"}</span>
                   </td>
                 <td/>
               </tr>
diff --git a/pages/main/index.js b/pages/main/index.js
index 236a4dfcf..147315ad1 100644
--- a/pages/main/index.js
+++ b/pages/main/index.js
@@ -1,7 +1,7 @@
 import React, {PropTypes} from 'react';
 import history from '../../core/history';
 import store from '../../core/store';
-import { fetchQueues, fetchRecentFiles, fetchImportFolders, fetchSeriesCount, fetchFilesCount, fetchJmmNews, fetchUpdateAvailableIfNeeded } from '../../core/actions';
+import { queueStatusAsync, recentFilesAsync, importFoldersAsync, seriesCountAsync, filesCountAsync, jmmNewsAsync, updateAvailableAsync } from '../../core/actions';
 import Layout from '../../components/Layout';
 import Footer from '../../components/Layout/Footer';
 import Overview from './Overview';
@@ -21,13 +21,16 @@ class MainPage extends React.Component {
             });
             return;
         }
-        store.dispatch(fetchQueues(state.activeApiKey))
-          .then(() => store.dispatch(fetchRecentFiles(state.activeApiKey))
-          .then(() => store.dispatch(fetchImportFolders(state.activeApiKey)))
-          .then(() => store.dispatch(fetchSeriesCount(state.activeApiKey)))
-          .then(() => store.dispatch(fetchFilesCount(state.activeApiKey)))
-          .then(() => store.dispatch(fetchJmmNews(state.activeApiKey)))
-          .then(() => fetchUpdateAvailableIfNeeded()(store.dispatch, store.getState))
+
+
+        queueStatusAsync()
+          .then(
+            () => recentFilesAsync()
+          .then(() => importFoldersAsync())
+          .then(() => seriesCountAsync())
+          .then(() => filesCountAsync())
+          .then(() => jmmNewsAsync())
+          .then(() => updateAvailableAsync())
         );
 
     }