diff --git a/config/index.js b/config/index.js
index 5356e2c0..56d87fa0 100644
--- a/config/index.js
+++ b/config/index.js
@@ -3,6 +3,7 @@ var path = require('path')
 module.exports = {
   // Webpack aliases
   aliases: {
+    'quasar-frameworks': path.resolve(__dirname, '../node_modules/quasar-framework/'),
     quasar: path.resolve(__dirname, '../node_modules/quasar-framework/'),
     src: path.resolve(__dirname, '../src'),
     assets: path.resolve(__dirname, '../src/assets'),
diff --git a/src/App.vue b/src/App.vue
index e7f59a52..112f7889 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script>
-    import { QTransition } from 'quasar'
+    import { QTransition } from 'quasar-framework'
     export default {
         components: {
             QTransition
diff --git a/src/api/pbx-config.js b/src/api/pbx-config.js
index 43fbb573..8f9166d0 100644
--- a/src/api/pbx-config.js
+++ b/src/api/pbx-config.js
@@ -3,19 +3,21 @@ import Vue from 'vue';
 
 export function getGroups(options) {
     return new Promise((resolve, reject)=>{
-        Promise.props({
-            numbers: Vue.http.get('/api/numbers'),
-            subscribers: Vue.http.get('/api/subscribers', {
-                params: {
-                    is_pbx_group: true
-                }
-            })
+        Vue.http.get('/api/subscribers', {
+            params: {
+                is_pbx_group: true
+            }
         }).then((result)=>{
-
-        }).then(()=>{
-            resolve();
+            var groups = [];
+            var body = JSON.parse(result.body);
+            if(_.isArray(body["_embedded"]["ngcp:subscribers"])) {
+                body['_embedded']['ngcp:subscribers'].forEach((group)=>{
+                    groups.push(group);
+                });
+            }
+            resolve(groups);
         }).catch((err)=>{
-            reject(err)
+            reject(err);
         });
     });
 }
diff --git a/src/api/user.js b/src/api/user.js
index d8db1cf6..e0eb7d80 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -26,13 +26,11 @@ export function getUserData(id) {
     return new Promise((resolve, reject)=>{
         return Promise.all([
             getSubscriberById(id),
-            getCapabilities(),
-            getNumbers()
+            getCapabilities()
         ]).then((results)=>{
             resolve({
                 subscriber: results[0],
-                capabilities: results[1],
-                numbers: results[2]
+                capabilities: results[1]
             });
         }).catch((err)=>{
             reject(err);
diff --git a/src/components/Error404.vue b/src/components/Error404.vue
index 28eac597..33226460 100644
--- a/src/components/Error404.vue
+++ b/src/components/Error404.vue
@@ -1,5 +1,11 @@
 <template>
-    <div>404 NotFound</div>
+    <q-layout>
+        <div id="csc-login" class="row">
+            <div class="column col-lg-4 col-xl-4 col-md-3 gt-sm"></div>
+            <div class="column col-12 col-md-6 col-lg-4 col-xl-4">404 NotFound</div>
+            <div class="column col-lg-4 col-xl-4 col-md-3 gt-sm"></div>
+        </div>
+    </q-layout>
 </template>
 
 <script>
diff --git a/src/components/Login.vue b/src/components/Login.vue
index 3425bca0..c180b6bf 100644
--- a/src/components/Login.vue
+++ b/src/components/Login.vue
@@ -10,10 +10,20 @@
                     </q-card-title>
                     <q-card-main>
                         <q-field icon="fa-user-circle" :helper="$t('username_helper')" :count="128">
-                            <q-input type="text" max-length="128" :float-label="$t('username')" clearable v-model="username"/>
+                            <q-input type="text"
+                                     max-length="128"
+                                     :float-label="$t('username')"
+                                     clearable
+                                     v-model="username"
+                                     @keyup.enter="login()"/>
                         </q-field>
                         <q-field icon="fa-lock" :helper="$t('password_helper')" :count="32">
-                            <q-input type="password" max-length="32" :float-label="$t('password')" clearable v-model="password"/>
+                            <q-input type="password"
+                                     max-length="32"
+                                     :float-label="$t('password')"
+                                     clearable
+                                     v-model="password"
+                                     @keyup.enter="login()"/>
                         </q-field>
                     </q-card-main>
                     <q-card-actions class="pull-right">
@@ -28,19 +38,8 @@
 
 <script>
     import { startLoading, stopLoading, showGlobalError } from '../helpers/ui'
-    import {
-        QLayout,
-        QCard,
-        QCardTitle,
-        QCardSeparator,
-        QCardMain,
-        QField,
-        QInput,
-        QCardActions,
-        QBtn,
-        QIcon,
-        Loading,
-        Alert } from 'quasar'
+    import { QLayout, QCard, QCardTitle, QCardSeparator, QCardMain, QField, QInput,
+        QCardActions, QBtn, QIcon, Loading, Alert } from 'quasar-framework'
     export default {
         name: 'login',
         components: {
@@ -57,14 +56,17 @@
         },
         data () {
             return {
-                user: '',
-                pass: ''
+                username: '',
+                password: ''
             }
         },
         methods: {
             login() {
                 startLoading();
-                this.$store.dispatch('user/login').then(()=>{
+                this.$store.dispatch('user/login', {
+                    username: this.username,
+                    password: this.password
+                }).then(()=>{
                     stopLoading();
                     this.$router.push({path : '/'});
                 }).catch((err)=>{
@@ -72,24 +74,6 @@
                     showGlobalError(this.$i18n.t('login_error'));
                 });
             }
-        },
-        computed: {
-            username: {
-                get () {
-                    return this.$store.state.user.username;
-                },
-                set (value) {
-                    this.$store.commit('user/updateUsername', value)
-                }
-            },
-            password: {
-                get () {
-                    return this.$store.state.user.password;
-                },
-                set (value) {
-                    this.$store.commit('user/updatePassword', value)
-                }
-            }
         }
     }
 </script>
diff --git a/src/components/Page.vue b/src/components/Page.vue
new file mode 100644
index 00000000..cc5a1b3f
--- /dev/null
+++ b/src/components/Page.vue
@@ -0,0 +1,55 @@
+<template>
+    <div class="page">
+        <q-fixed-position corner="top-left" :offset="[0,0]" class="page-title transition-generic">
+            <h2>{{ title }}</h2>
+        </q-fixed-position>
+        <div class="page-content">
+            <slot></slot>
+        </div>
+    </div>
+</template>
+
+<script>
+    import { QIcon, QFixedPosition } from 'quasar-framework'
+    export default {
+        name: 'page',
+        props: [
+            'title'
+        ],
+        data () {
+            return {}
+        },
+        components: {
+            QIcon,
+            QFixedPosition
+        }
+    }
+</script>
+
+<style lang="stylus">
+    @import '../../src/themes/app.variables.styl';
+    .page {
+        padding: 60px;
+        padding-top: 100px;
+    }
+
+    .page h2 {
+        margin: 0px;
+        font-size: 26px;
+        line-height: 26px;
+        color: #68A44E;
+    }
+
+    .page .page-title {
+        right: 0;
+        padding: 30px;
+        padding-left: 60px;
+        background-color: white;
+        z-index: 1000;
+    }
+
+    .page-title-icon {
+        margin-right: 10px;
+        font-size: 24px !important;
+    }
+</style>
diff --git a/src/components/layouts/Default.vue b/src/components/layouts/Default.vue
index 1de83874..d8c6a89c 100644
--- a/src/components/layouts/Default.vue
+++ b/src/components/layouts/Default.vue
@@ -9,7 +9,8 @@
                 <span slot="subtitle"></span>
             </q-toolbar-title>
             <q-btn flat @click="" icon-right="fa-user-circle">
-                <span id="user-login-as">{{ $t('loggedInAs') }}</span><span id="user-name">{{ getUsername }}</span>
+                <span id="user-login-as" class="gt-sm">{{ $t('loggedInAs') }}</span>
+                <span id="user-name" class="gt-xs">{{ getUsername }}</span>
                 <q-popover ref="popover">
                     <q-list item-separator link>
                         <q-item @click="logout()">
@@ -81,7 +82,7 @@
                 </q-side-link>
             </q-collapsible>
         </q-list>
-        <q-fixed-position corner="top-right" :offset="[20, 20]">
+        <q-fixed-position corner="top-right" :offset="[60, 16]" class="page-action-button">
             <q-fab color="primary" icon="question answer" active-icon="clear" direction="left" flat>
                 <q-fab-action color="primary" @click="" icon="fa-fax" flat>
                     <q-tooltip anchor="bottom middle" self="top middle" :offset="[0, 15]">{{ $t('sendFax') }}</q-tooltip>
@@ -126,10 +127,14 @@
         name: 'default',
         mounted: function() {
             this.$refs.layout.showLeft();
-//            this.$store.dispatch('connectRtcEngine');
-        },
-        created: function() {
-            this.$store.dispatch('user/initUser');
+            if(!this.$store.getters['user/hasUser']) {
+                startLoading();
+                this.$store.dispatch('user/initUser').then(()=>{
+                    stopLoading();
+                }).catch(()=>{
+                    this.logout();
+                });
+            }
         },
         components: {
             QLayout,
@@ -172,9 +177,6 @@
                 if(!this.$store.state.rtcEngineConnected) {
                     showGlobalError(this.$t('rtcEngineDisconnected'));
                 }
-            },
-            navigate(path) {
-                this.$router.push({path: path});
             }
         }
     }
@@ -227,4 +229,20 @@
     #user-name {
         font-weight: bold;
     }
+
+    .q-card {
+        margin: 0;
+    }
+
+    .q-card.page {
+        padding: 15px;
+    }
+
+    .q-card.pbx-group {
+        margin-bottom: 15px;
+    }
+
+    .page-action-button {
+        z-index: 1001;
+    }
 </style>
diff --git a/src/components/pages/CallBlocking/Incoming.vue b/src/components/pages/CallBlocking/Incoming.vue
index 56809db1..f32d7099 100644
--- a/src/components/pages/CallBlocking/Incoming.vue
+++ b/src/components/pages/CallBlocking/Incoming.vue
@@ -1,11 +1,15 @@
 <template>
-    <div>CallBlocking Incoming</div>
+    <page title="Incoming"></page>
 </template>
 
 <script>
+    import Page  from '../../Page'
     export default {
         data () {
             return {}
+        },
+        components: {
+            Page
         }
     }
 </script>
diff --git a/src/components/pages/CallBlocking/Outgoing.vue b/src/components/pages/CallBlocking/Outgoing.vue
index de8127ec..25dc2085 100644
--- a/src/components/pages/CallBlocking/Outgoing.vue
+++ b/src/components/pages/CallBlocking/Outgoing.vue
@@ -1,11 +1,15 @@
 <template>
-    <div>CallBlocking Outgoing</div>
+    <page title="Outgoing"></page>
 </template>
 
 <script>
+    import Page  from '../../Page'
     export default {
         data () {
             return {}
+        },
+        components: {
+            Page
         }
     }
 </script>
diff --git a/src/components/pages/CallBlocking/Privacy.vue b/src/components/pages/CallBlocking/Privacy.vue
index 95c7d025..6c07a8fd 100644
--- a/src/components/pages/CallBlocking/Privacy.vue
+++ b/src/components/pages/CallBlocking/Privacy.vue
@@ -1,11 +1,15 @@
 <template>
-    <div>CallBlocking Privacy</div>
+    <page title="Privacy"></page>
 </template>
 
 <script>
+    import Page  from '../../Page'
     export default {
         data () {
             return {}
+        },
+        components: {
+            Page
         }
     }
 </script>
diff --git a/src/components/pages/CallForward/AfterHours.vue b/src/components/pages/CallForward/AfterHours.vue
index ff37b231..e07f4d80 100644
--- a/src/components/pages/CallForward/AfterHours.vue
+++ b/src/components/pages/CallForward/AfterHours.vue
@@ -1,11 +1,15 @@
 <template>
-    <div>CallForward AfterHours</div>
+    <page title="After Hours"></page>
 </template>
 
 <script>
+    import Page  from '../../Page'
     export default {
         data () {
             return {}
+        },
+        components: {
+            Page
         }
     }
 </script>
diff --git a/src/components/pages/CallForward/Always.vue b/src/components/pages/CallForward/Always.vue
index 88d94987..cdf15d5d 100644
--- a/src/components/pages/CallForward/Always.vue
+++ b/src/components/pages/CallForward/Always.vue
@@ -1,11 +1,15 @@
 <template>
-    <div>CallForward Always</div>
+    <page title="Always"></page>
 </template>
 
 <script>
+    import Page  from '../../Page'
     export default {
         data () {
             return {}
+        },
+        components: {
+            Page
         }
     }
 </script>
diff --git a/src/components/pages/CallForward/CompanyHours.vue b/src/components/pages/CallForward/CompanyHours.vue
index 8bd40932..35ba268f 100644
--- a/src/components/pages/CallForward/CompanyHours.vue
+++ b/src/components/pages/CallForward/CompanyHours.vue
@@ -1,11 +1,15 @@
 <template>
-    <div>CallForward CompanyHours</div>
+    <page title="Company Hours"></page>
 </template>
 
 <script>
+    import Page  from '../../Page'
     export default {
         data () {
             return {}
+        },
+        components: {
+            Page
         }
     }
 </script>
diff --git a/src/components/pages/Conversations.vue b/src/components/pages/Conversations.vue
index 71915345..55d04be5 100644
--- a/src/components/pages/Conversations.vue
+++ b/src/components/pages/Conversations.vue
@@ -1,11 +1,15 @@
 <template>
-    <div>Conversations</div>
+    <page title="Conversations"></page>
 </template>
 
 <script>
+    import Page  from '../Page'
     export default {
         data () {
             return {}
+        },
+        components: {
+            Page
         }
     }
 </script>
diff --git a/src/components/pages/PbxConfiguration/Devices.vue b/src/components/pages/PbxConfiguration/Devices.vue
index 29309a61..39488b01 100644
--- a/src/components/pages/PbxConfiguration/Devices.vue
+++ b/src/components/pages/PbxConfiguration/Devices.vue
@@ -1,11 +1,15 @@
 <template>
-    <div>PBX Devices</div>
+    <page title="Devices"></page>
 </template>
 
 <script>
+    import Page  from '../../Page'
     export default {
         data () {
             return {}
+        },
+        components: {
+            Page
         }
     }
 </script>
diff --git a/src/components/pages/PbxConfiguration/Groups.vue b/src/components/pages/PbxConfiguration/Groups.vue
index 0e442b28..5e6d84bc 100644
--- a/src/components/pages/PbxConfiguration/Groups.vue
+++ b/src/components/pages/PbxConfiguration/Groups.vue
@@ -1,14 +1,49 @@
 <template>
-    <div>PBX Groups</div>
+    <page title="PBX Groups"></page>
 </template>
 
 <script>
+
+    import Page  from '../../Page'
+    import { QChip, QCard, QCardSeparator, QCardTitle, QCardMain,
+        QIcon, QPopover, QList, QItem, QItemMain } from 'quasar-framework'
+    import { mapState } from 'vuex'
+
     export default {
+        components: {
+            Page,
+            QChip,
+            QCard,
+            QCardSeparator,
+            QCardTitle,
+            QCardMain,
+            QIcon,
+            QPopover,
+            QList,
+            QItem,
+            QItemMain
+        },
+        mounted() {
+            this.$store.dispatch('pbxGroups/load').then(()=>{
+
+            }).catch((err)=>{
+
+            });
+        },
         data () {
             return {}
-        }
+        },
+        computed: {
+            ...mapState({
+                groups: state => state.pbxGroups.groups,
+            })
+        },
     }
 </script>
 
-<style>
+<style lang="stylus">
+    @import '../../../../src/themes/app.variables.styl';
+    .number {
+        color: $primary;
+    }
 </style>
diff --git a/src/components/pages/PbxConfiguration/Seats.vue b/src/components/pages/PbxConfiguration/Seats.vue
index e67402ca..64124dc6 100644
--- a/src/components/pages/PbxConfiguration/Seats.vue
+++ b/src/components/pages/PbxConfiguration/Seats.vue
@@ -1,11 +1,15 @@
 <template>
-    <div>PBX Seats</div>
+    <page title="Seats"></page>
 </template>
 
 <script>
+    import Page  from '../../Page'
     export default {
         data () {
             return {}
+        },
+        components: {
+            Page
         }
     }
 </script>
diff --git a/src/components/pages/Reminder.vue b/src/components/pages/Reminder.vue
index 1d3a2289..6bd54eb5 100644
--- a/src/components/pages/Reminder.vue
+++ b/src/components/pages/Reminder.vue
@@ -1,11 +1,15 @@
 <template>
-    <div>Reminder</div>
+    <page title="Reminder"></page>
 </template>
 
 <script>
+    import Page  from '../Page'
     export default {
         data () {
             return {}
+        },
+        components: {
+            Page
         }
     }
 </script>
diff --git a/src/filters/index.js b/src/filters/index.js
new file mode 100644
index 00000000..813a6f85
--- /dev/null
+++ b/src/filters/index.js
@@ -0,0 +1,5 @@
+
+import Vue from 'vue';
+import NumberFilter from './number'
+
+Vue.filter('number', NumberFilter);
diff --git a/src/filters/number.js b/src/filters/number.js
new file mode 100644
index 00000000..201ac394
--- /dev/null
+++ b/src/filters/number.js
@@ -0,0 +1,4 @@
+
+export default function(number) {
+    return '+' + number.cc + number.ac + number.sn;
+}
diff --git a/src/helpers/ui.js b/src/helpers/ui.js
index 40b38201..e800627b 100644
--- a/src/helpers/ui.js
+++ b/src/helpers/ui.js
@@ -1,5 +1,5 @@
 
-import { Loading, Alert } from 'quasar'
+import { Loading, Alert } from 'quasar-framework'
 
 export function startLoading() {
     Loading.show({ delay: 0 });
diff --git a/src/main.js b/src/main.js
index 77966470..790585d9 100644
--- a/src/main.js
+++ b/src/main.js
@@ -13,11 +13,12 @@ require(`./themes/app.${__THEME}.styl`)
 import _ from 'lodash'
 import Vue from 'vue'
 import VueResource from 'vue-resource'
-import Quasar from 'quasar'
+import Quasar from 'quasar-framework'
 import { store } from './store'
 import { i18n, locales } from './i18n'
 import router from './router'
 import { sync } from 'vuex-router-sync'
+import filters from './filters'
 
 Vue.use(VueResource);
 
diff --git a/src/store/index.js b/src/store/index.js
index c74eea41..cf1c2208 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -3,7 +3,9 @@
 import _ from 'lodash'
 import Vue from 'vue'
 import Vuex from 'vuex'
-// import cdk from 'cdk';
+
+import UserModule from './user'
+import PbxGroupsModule from './pbx-groups'
 
 var rtcEngineClient = null;
 var rtcEngineNetwork = null;
@@ -12,7 +14,8 @@ Vue.use(Vuex);
 
 export const store = new Vuex.Store({
     modules: {
-        user: require('./user').UserModule
+        user: UserModule,
+        pbxGroups: PbxGroupsModule
     },
     state: {
         rtcEngineConnected: false
diff --git a/src/store/pbx-config/groups.js b/src/store/pbx-groups.js
similarity index 67%
rename from src/store/pbx-config/groups.js
rename to src/store/pbx-groups.js
index d94cf06d..2342aa57 100644
--- a/src/store/pbx-config/groups.js
+++ b/src/store/pbx-groups.js
@@ -1,7 +1,8 @@
 
-import { getGroups } from '../../api/pbx-config'
+import { getGroups } from '../api/pbx-config'
 
-export const PbxGroups = {
+export default {
+    namespaced: true,
     state: {
         groups: [],
         page: 1
@@ -10,15 +11,15 @@ export const PbxGroups = {
 
     },
     mutations: {
-        showGroups: function(state, options) {
+        show: function(state, options) {
             state.groups = options.groups;
         }
     },
     actions: {
-        loadGroups: function(context, options) {
+        load: function(context, options) {
             return new Promise((resolve, reject)=>{
                 getGroups().then((groups)=>{
-                    context.commit('showGroups', {
+                    context.commit('show', {
                         groups: groups
                     });
                 }).catch((err)=>{
diff --git a/src/store/user.js b/src/store/user.js
index 48dfea70..c0cd191e 100644
--- a/src/store/user.js
+++ b/src/store/user.js
@@ -2,28 +2,22 @@
 
 import _ from 'lodash';
 import { login, getCapabilities, getUserData} from '../api/user';
-import Vue from 'vue';
 
-// import cdk from 'cdk';
-
-var rtcEngineClient = '';
-
-export const UserModule = {
+export default {
     namespaced: true,
     state: {
-        username: '',
-        password: '',
         jwt: localStorage.getItem('jwt') || null,
         subscriberId: localStorage.getItem('subscriberId') || null,
-        loggedUsername: '',
         subscriber: null,
-        capabilities: null,
-        numbers: null
+        capabilities: null
     },
     getters: {
         isLogged(state, getters) {
             return !_.isEmpty(state.jwt) && !_.isEmpty(state.subscriberId);
         },
+        hasUser(state, getters) {
+            return state.subscriber !== null;
+        },
         getUsername(state, getters) {
             if(state.subscriber !== null && !_.isEmpty(state.subscriber.display_name)) {
                 return state.subscriber.display_name;
@@ -44,32 +38,34 @@ export const UserModule = {
         login(state, options) {
             state.jwt = options.jwt;
             state.subscriberId = options.subscriberId;
+            state.subscriber = options.subscriber;
+            state.capabilities = options.capabilities;
         },
         setUserData(state, options) {
             state.subscriber = options.subscriber;
             state.capabilities = options.capabilities;
-            state.numbers = options.numbers;
         },
         logout(state) {
             state.jwt = null;
             state.subscriberId = null;
-        },
-        updatePassword (state, password) {
-            state.password = password;
-        },
-        updateUsername (state, username) {
-            state.username = username;
+            state.subscriber = null;
+            state.capabilities = null;
         }
     },
     actions: {
-        login(context) {
+        login(context, options) {
             return new Promise((resolve, reject)=>{
-                login(context.state.username, context.state.password).then((result)=>{
+                login(options.username, options.password).then((result)=>{
                     localStorage.setItem('jwt', result.jwt);
                     localStorage.setItem('subscriberId', result.subscriberId);
+                }).then(()=>{
+                    return getUserData(localStorage.getItem('subscriberId'));
+                }).then((result)=>{
                     context.commit('login', {
                         jwt: localStorage.getItem('jwt'),
-                        subscriberId: localStorage.getItem('subscriberId')
+                        subscriberId: localStorage.getItem('subscriberId'),
+                        subscriber: result.subscriber,
+                        capabilities: result.capabilities
                     });
                     resolve();
                 }).catch((err)=>{
@@ -93,8 +89,7 @@ export const UserModule = {
                 getUserData(localStorage.getItem('subscriberId')).then((result)=>{
                     context.commit('setUserData', {
                         subscriber: result.subscriber,
-                        capabilities: result.capabilities,
-                        numbers: result.numbers
+                        capabilities: result.capabilities
                     });
                     resolve();
                 }).catch((err)=>{
diff --git a/t/components/login.js b/t/components/login.js
new file mode 100644
index 00000000..68d06e57
--- /dev/null
+++ b/t/components/login.js
@@ -0,0 +1,13 @@
+
+import Vue from 'vue'
+import Login from '../../src/components/Login.vue'
+import { assert } from 'chai';
+
+describe('Login', function() {
+
+    it('should initialize with default data', function(){
+        var defaultData = Login.data();
+        assert.equal(defaultData.username, '');
+        assert.equal(defaultData.password, '');
+    });
+});
diff --git a/t/store/user.js b/t/store/user.js
index d32772c8..b566aab0 100644
--- a/t/store/user.js
+++ b/t/store/user.js
@@ -1,6 +1,6 @@
 'use strict';
 
-import { UserModule } from '../../src/store/user';
+import UserModule  from '../../src/store/user';
 import { assert } from 'chai';
 
 describe('UserModule', ()=>{