diff --git a/package-lock.json b/package-lock.json
index 8ed2120..dfcc0c4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10920,6 +10920,14 @@
         "react-display-name": "^0.2.0"
       }
     },
+    "react-grid-system": {
+      "version": "4.4.10",
+      "resolved": "https://registry.npmjs.org/react-grid-system/-/react-grid-system-4.4.10.tgz",
+      "integrity": "sha512-ZSmQ+284QOYqDKkb5kbaFUWsuczLMQmlkAYNVv2UorG1z177UxQPYcCwmzKXpuGascksImuLpitpMpnn0UacXg==",
+      "requires": {
+        "prop-types": "^15.7.2"
+      }
+    },
     "react-is": {
       "version": "16.8.6",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz",
diff --git a/package.json b/package.json
index 909ec50..16782d4 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "react-dnd-html5-backend": "^9.3.2",
     "react-dom": "^16.8.6",
     "react-fullscreenable": "^2.5.1-0",
+    "react-grid-system": "^4.4.10",
     "react-json-view": "^1.19.1",
     "react-notification-system": "^0.2.17",
     "react-rnd": "^10.0.0",
diff --git a/src/api/rest-api.js b/src/api/rest-api.js
index 43af793..4fb5395 100644
--- a/src/api/rest-api.js
+++ b/src/api/rest-api.js
@@ -58,7 +58,8 @@ class RestAPI {
       var req = request.get(url);
 
       if (token != null) {
-        req.set('x-access-token', token);
+        req.set('Authorization', "Bearer " + token);
+
       }
 
       req.end(function (error, res) {
@@ -76,7 +77,7 @@ class RestAPI {
       var req = request.post(url).send(body).timeout({ response: 5000 }); // Simple response start timeout (3s)
 
       if (token != null) {
-        req.set('x-access-token', token);
+        req.set('Authorization', "Bearer " + token);
       }
       
       req.end(function (error, res) {
@@ -97,7 +98,7 @@ class RestAPI {
       var req = request.delete(url);
 
       if (token != null) {
-        req.set('x-access-token', token);
+        req.set('Authorization', "Bearer " + token);
       }
 
       req.end(function (error, res) {
@@ -115,7 +116,7 @@ class RestAPI {
       var req = request.put(url).send(body);
 
       if (token != null) {
-        req.set('x-access-token', token);
+        req.set('Authorization', "Bearer " + token);
       }
 
       req.end(function (error, res) {
@@ -133,7 +134,7 @@ class RestAPI {
       const req = request.post(url).send(data).on('progress', progressCallback);
 
       if (token != null) {
-        req.set('x-access-token', token);
+        req.set('Authorization', "Bearer " + token);
       }
 
       req.end(function (error, res) {
diff --git a/src/components/dialogs/edit-simulator.js b/src/components/dialogs/edit-simulator.js
index de08938..74edcd2 100644
--- a/src/components/dialogs/edit-simulator.js
+++ b/src/components/dialogs/edit-simulator.js
@@ -74,17 +74,17 @@ class EditSimulatorDialog extends React.Component {
       <Dialog show={this.props.show} title="Edit Simulator" buttonTitle="Save" onClose={(c) => this.onClose(c)} onReset={() => this.resetState()} valid={this.valid}>
         <form>
           <FormGroup controlId="name">
-            <FormLabel>Name</FormLabel>
-            <FormControl type="text" placeholder={_.get(this.props.simulator, 'rawProperties.name')} value={this.state.name} onChange={(e) => this.handleChange(e)} />
+            <FormLabel column={false}>Name</FormLabel>
+            <FormControl type="text" placeholder={_.get(this.props.simulator, 'properties.name')} value={this.state.name} onChange={(e) => this.handleChange(e)} />
             <FormControl.Feedback />
           </FormGroup>
           <FormGroup controlId="endpoint">
-            <FormLabel>Endpoint</FormLabel>
-            <FormControl type="text" placeholder={_.get(this.props.simulator, 'rawProperties.endpoint')} value={this.state.endpoint || 'http://' } onChange={(e) => this.handleChange(e)} />
+            <FormLabel column={false}>Endpoint</FormLabel>
+            <FormControl type="text" placeholder={_.get(this.props.simulator, 'properties.endpoint')} value={this.state.endpoint || 'http://' } onChange={(e) => this.handleChange(e)} />
             <FormControl.Feedback />
           </FormGroup>
           <FormGroup controlId='properties'>
-            <FormLabel>Properties</FormLabel>
+            <FormLabel column={false}>Properties</FormLabel>
             <ParametersEditor content={_.merge({}, this.props.simulator.rawProperties, this.props.simulator.properties)} disabled={true} />
           </FormGroup>
         </form>
diff --git a/src/components/dialogs/import-simulation-model.js b/src/components/dialogs/import-simulation-model.js
index af9a7dc..55e7a2b 100644
--- a/src/components/dialogs/import-simulation-model.js
+++ b/src/components/dialogs/import-simulation-model.js
@@ -99,7 +99,7 @@ class ImportSimulationModelDialog extends React.Component {
             <FormLabel>Simulator</FormLabel>
             <FormControl disabled={this.imported === false} componentClass='select' placeholder='Select simulator' value={this.state.model.simulator} onChange={this.handleSimulatorChange}>
               {this.props.simulators.map(simulator => (
-                <option key={simulator._id} value={simulator._id}>{_.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name')}</option>
+                <option key={simulator.id} value={simulator.id}>{_.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name')}</option>
               ))}
             </FormControl>
           </FormGroup>
diff --git a/src/components/dialogs/new-user.js b/src/components/dialogs/new-user.js
index 554e14f..a0c1ed0 100644
--- a/src/components/dialogs/new-user.js
+++ b/src/components/dialogs/new-user.js
@@ -34,7 +34,8 @@ class NewUserDialog extends React.Component {
       username: '',
       mail: '',
       role: 'admin',
-      password: ''
+      password: '',
+      id: 0
     };
   }
 
@@ -57,7 +58,8 @@ class NewUserDialog extends React.Component {
       username: '',
       mail: '',
       role: 'admin',
-      password: ''
+      password: '',
+      id: 0
     });
   }
 
@@ -65,8 +67,9 @@ class NewUserDialog extends React.Component {
     // check all controls
     let username = this.state.username !== '' && this.state.username.length >= 3;
     let password = this.state.password !== '';
+    let id = this.state.id !== 0;
 
-    this.valid =  username && password;
+    this.valid =  username && password && id;
 
     // return state to control
     switch(target) {
@@ -74,6 +77,8 @@ class NewUserDialog extends React.Component {
         return username ? "success" : "error";
       case 'password':
         return password ? "success" : "error";
+      case 'id':
+        return id ? "success" : "error";
       default:
         return "success";
     }
diff --git a/src/components/header-menu.js b/src/components/header-menu.js
index b2daf0e..0273407 100644
--- a/src/components/header-menu.js
+++ b/src/components/header-menu.js
@@ -26,14 +26,15 @@ import { NavLink } from 'react-router-dom';
 export default class HeaderMenu extends React.Component {
   render() {
     return <div>
-      <Button className="closeButton" bsStyle="link" onClick={this.props.onClose}>&times;</Button>
+
+      <Button className="closeButton" variant="link" onClick={this.props.onClose}>&times;</Button>
 
       <ul>
         <li><NavLink to="/home" activeClassName="active" title="Home" onClick={this.props.onClose}>Home</NavLink></li>
         <li><NavLink to="/projects" activeClassName="active" title="Projects" onClick={this.props.onClose}>Projects</NavLink></li>
         <li><NavLink to="/simulations" activeClassName="active" title="Simulations" onClick={this.props.onClose}>Simulations</NavLink></li>
         <li><NavLink to="/simulators" activeClassName="active" title="Simulators" onClick={this.props.onClose}>Simulators</NavLink></li>
-        { this.props.currentRole === 'admin' ? 
+        { this.props.currentRole === 'Admin' ?
             <li><NavLink to="/users" activeClassName="active" title="User Management" onClick={this.props.onClose}>User Management</NavLink></li> : ''
         }
         <li><NavLink to="/logout" title="Logout" onClick={this.props.onClose}>Logout</NavLink></li>
diff --git a/src/components/header.js b/src/components/header.js
index 710ea9b..7d72e0c 100644
--- a/src/components/header.js
+++ b/src/components/header.js
@@ -21,20 +21,25 @@
 
 import React from 'react';
 import { Col, Button } from 'react-bootstrap';
+import { Hidden } from 'react-grid-system'
 import Icon from './icon';
 
 class Header extends React.Component {
   render() {
     return (
       <header className="app-header">
-        <Col xs={10} smOffset={2} sm={8}>
+        <Col xs={{span: 10}} sm={{span: 8, offset: 2}}>
           <h1>VILLASweb</h1>
         </Col>
-        <Col xs={2} smHidden mdHidden lgHidden style={{ paddingLeft: 'auto', paddingRight: 0 }}>
-          {this.props.showMenuButton &&
-            <Button bsStyle="link" onClick={this.props.onMenuButton} style={{ float: 'right', marginRight: '10px' }}><Icon size="3x" icon="bars" className="menu-icon" /></Button>
-          }
-        </Col>
+        <Hidden sm md lg xl>
+          <Col xs={2} style={{ paddingLeft: 'auto', paddingRight: 0 }}>
+            {this.props.showMenuButton &&
+              <Button variant="link" onClick={this.props.onMenuButton} style={{ float: 'right', marginRight: '10px' }}>
+                <Icon size="3x" icon="bars" className="menu-icon" />
+              </Button>
+            }
+          </Col>
+        </Hidden>
       </header>
     );
   }
diff --git a/src/components/home.js b/src/components/home.js
index b81bab7..63863fb 100644
--- a/src/components/home.js
+++ b/src/components/home.js
@@ -21,16 +21,24 @@
 
 import React from 'react';
 
-import { Link } from 'react-router-dom';
+//import { Link } from 'react-router-dom';
 
-import RestAPI from '../api/rest-api';
+//import RestAPI from '../api/rest-api';
 
 import config from '../config';
+import UserStore from "../stores/user-store";
 
 class Home extends React.Component {
   constructor(props) {
     super(props);
-    this.state = {};
+    let currentUser = UserStore.getState().currentUser;
+
+    this.state = {
+      currentRole: currentUser ? currentUser.role : '',
+      currentUsername: currentUser ? currentUser.username: '',
+      currentUserID: currentUser ? currentUser.id: 0,
+      token: UserStore.getState().token
+    };
   }
 
   getCounts(type) {
@@ -56,15 +64,21 @@ class Home extends React.Component {
           VILLASweb is a frontend for distributed real-time simulation hosted by <a href={"mailto:" + config.admin.mail}>{config.admin.name}</a>.
         </p>
         <p>
-          This instance is hosting <Link to="/projects" title="Projects">{this.getCounts('projects')} projects</Link> consisting of <Link to="/simulators" title="Simulators">{this.getCounts('simulators')} simulators</Link>, {this.getCounts('visualizations')} visualizations and <Link to="/simulations" title="Simulations">{this.getCounts('simulations')} simulations</Link>.
-          A total of <Link to="/users" title="Users">{this.getCounts('users')} users</Link> are registered.<br />
+        You are logged in as user {this.state.currentUsername} with ID {this.state.currentUserID} and role {this.state.currentRole}.
         </p>
+        {/*
+          <p>
+            This instance is hosting <Link to="/projects" title="Projects">{this.getCounts('projects')} projects</Link> consisting of <Link to="/simulators" title="Simulators">{this.getCounts('simulators')} simulators</Link>, {this.getCounts('visualizations')} visualizations and <Link to="/simulations" title="Simulations">{this.getCounts('simulations')} simulations</Link>.
+            A total of <Link to="/users" title="Users">{this.getCounts('users')} users</Link> are registered.<br />
+          </p>
+        */}
         <h3>Credits</h3>
         <p>VILLASweb is developed by the <a href="http://acs.eonerc.rwth-aachen.de">Institute for Automation of Complex Power Systems</a> at the <a href="https;//www.rwth-aachen.de">RWTH Aachen University</a>.</p>
         <ul>
           <li><a href="mailto:mgrigull@eonerc.rwth-aachen.de">Markus Grigull</a></li>
           <li><a href="mailto:stvogel@eonerc.rwth-aachen.de">Steffen Vogel</a></li>
           <li><a href="mailto:mstevic@eonerc.rwth-aachen.de">Marija Stevic</a></li>
+          <li><a href="mailto:sonja.happ@eonerc.rwth-aachen.de">Sonja Happ</a></li>
         </ul>
         <h3>Links</h3>
         <ul>
diff --git a/src/components/login-form.js b/src/components/login-form.js
index e2b48c6..7747723 100644
--- a/src/components/login-form.js
+++ b/src/components/login-form.js
@@ -61,20 +61,16 @@ class LoginForm extends Component {
 
   render() {
     return (
-      <Form horizontal>
+      <Form>
         <FormGroup controlId="username">
-          <Col componentClass={FormLabel} sm={2}>
-            Username
-          </Col>
+          <FormLabel column={true} sm={2}>Username</FormLabel>
           <Col sm={10}>
             <FormControl type="text" placeholder="Username" onChange={(e) => this.handleChange(e)} />
           </Col>
         </FormGroup>
 
         <FormGroup controlId="password">
-          <Col componentClass={FormLabel} sm={2}>
-            Password
-          </Col>
+          <FormLabel column={true} sm={2}>Password</FormLabel>
           <Col sm={10}>
             <FormControl type="password" placeholder="Password" onChange={(e) => this.handleChange(e)} />
           </Col>
@@ -82,14 +78,14 @@ class LoginForm extends Component {
 
         {this.props.loginMessage &&
           <div style={{ marginBottom: '50px', color: 'red' }}>
-            <Col smOffset={2} sm={10} style={{ paddingLeft: '5px' }}>
+            <Col sm={{span: 10, offset: 2}} style={{ paddingLeft: '5px' }}>
               <i>Error: </i>{this.props.loginMessage}
             </Col>
           </div>
         }
 
         <FormGroup>
-          <Col smOffset={2} sm={10}>
+          <Col sm={{span: 10, offset: 2}}>
             <Button type="submit" disabled={this.state.disableLogin} onClick={e => this.login(e)}>Login</Button>
           </Col>
         </FormGroup>
diff --git a/src/components/menu-sidebar.js b/src/components/menu-sidebar.js
index 51d7d83..8ea2e8d 100644
--- a/src/components/menu-sidebar.js
+++ b/src/components/menu-sidebar.js
@@ -33,7 +33,7 @@ class SidebarMenu extends React.Component {
           <li><NavLink to="/projects" activeClassName="active" title="Projects">Projects</NavLink></li>
           <li><NavLink to="/simulations" activeClassName="active" title="Simulations">Simulations</NavLink></li>
           <li><NavLink to="/simulators" activeClassName="active" title="Simulators">Simulators</NavLink></li>
-          { this.props.currentRole === 'admin' ? 
+          { this.props.currentRole === 'Admin' ?
               <li><NavLink to="/users" activeClassName="active" title="User Management">Users</NavLink></li> : ''
           }
           <li><NavLink to="/logout" title="Logout">Logout</NavLink></li>
diff --git a/src/components/table-column.js b/src/components/table-column.js
index 1aafc2e..151e3eb 100644
--- a/src/components/table-column.js
+++ b/src/components/table-column.js
@@ -36,7 +36,10 @@ class TableColumn extends Component {
     clickable: false,
     labelKey: null,
     checkbox: false,
-    checkboxKey: ''
+    checkboxKey: '',
+    labelStyle: null,
+    labelModifier: null
+
   };
 
   render() {
diff --git a/src/components/table.js b/src/components/table.js
index ed118a0..8d2d33d 100644
--- a/src/components/table.js
+++ b/src/components/table.js
@@ -74,7 +74,7 @@ class CustomTable extends Component {
       if (linkKey && data[linkKey] != null) {
         cell.push(<Link to={child.props.link + data[linkKey]}>{content}</Link>);
       } else if (child.props.clickable) {
-        cell.push(<Button bsStyle="link" onClick={() => child.props.onClick(index)}>{content}</Button>);
+        cell.push(<Button variant="link" onClick={() => child.props.onClick(index)}>{content}</Button>);
       } else {
         cell.push(content);
       }
@@ -89,7 +89,13 @@ class CustomTable extends Component {
         labelContent = child.props.labelModifier(labelContent, data);
       }
 
-      cell.push(<span>&nbsp;<FormLabel bsClass={child.props.labelStyle(data[labelKey], data)}>{labelContent.toString()}</FormLabel></span>);
+      cell.push(<span>
+        &nbsp;
+          <FormLabel column={false} classes={child.props.labelStyle(data[labelKey], data)}>
+            {labelContent.toString()}
+          </FormLabel>
+      </span>
+      );
     }
 
     if (child.props.dataIndex) {
@@ -98,11 +104,11 @@ class CustomTable extends Component {
 
     // add buttons
     if (child.props.editButton) {
-      cell.push(<Button bsClass='table-control-button' onClick={() => child.props.onEdit(index)} disabled={child.props.onEdit == null}><Icon icon='edit' /></Button>);
+      cell.push(<Button variant='table-control-button' onClick={() => child.props.onEdit(index)} disabled={child.props.onEdit == null}><Icon icon='edit' /></Button>);
     }
 
     if (child.props.deleteButton) {
-      cell.push(<Button bsClass='table-control-button' onClick={() => child.props.onDelete(index)} disabled={child.props.onDelete == null}><Icon icon='trash' /></Button>);
+      cell.push(<Button variant='table-control-button' onClick={() => child.props.onDelete(index)} disabled={child.props.onDelete == null}><Icon icon='trash' /></Button>);
     }
 
     if (child.props.checkbox) {
@@ -112,7 +118,7 @@ class CustomTable extends Component {
     }
 
     if (child.props.exportButton) {
-      cell.push(<Button bsClass='table-control-button' onClick={() => child.props.onExport(index)} disabled={child.props.onExport == null}><Icon icon='download' /></Button>);
+      cell.push(<Button variant='table-control-button' onClick={() => child.props.onExport(index)} disabled={child.props.onExport == null}><Icon icon='download' /></Button>);
     }
 
     return cell;
diff --git a/src/containers/app.js b/src/containers/app.js
index 5474190..763e012 100644
--- a/src/containers/app.js
+++ b/src/containers/app.js
@@ -26,6 +26,7 @@ import HTML5Backend from 'react-dnd-html5-backend';
 import NotificationSystem from 'react-notification-system';
 import { Redirect, Route } from 'react-router-dom';
 import { Col } from 'react-bootstrap';
+import { Hidden } from 'react-grid-system'
 
 import AppDispatcher from '../app-dispatcher';
 import SimulationStore from '../stores/simulation-store';
@@ -63,6 +64,8 @@ class App extends React.Component {
       simulators: SimulatorStore.getState(),
       simulations: SimulationStore.getState(),
       currentRole: currentUser ? currentUser.role : '',
+      currentUsername: currentUser ? currentUser.username: '',
+      currentUserID: UserStore.getState().userid,
       token: UserStore.getState().token,
 
       showSidebarMenu: false,
@@ -72,6 +75,7 @@ class App extends React.Component {
   componentWillMount() {
     // if token stored locally, request user
     const token = localStorage.getItem('token');
+    const userid = localStorage.getItem('userid');
 
     if (token != null && token !== '') {
       // save token so we dont logout
@@ -79,7 +83,8 @@ class App extends React.Component {
 
       AppDispatcher.dispatch({
         type: 'users/logged-in',
-        token: token
+        token: token,
+        userid: userid
       });
     }
   }
@@ -115,17 +120,22 @@ class App extends React.Component {
     return (
       <DndProvider backend={HTML5Backend} >
         <div>
+          {/*
           <Col style={{ width: this.state.showSidebarMenu ? '280px' : '0px' }} smHidden mdHidden lgHidden className="sidenav">
-            <HeaderMenu onClose={this.hideSidebarMenu} currentRole={this.state.currentRole} />
-          </Col>
+          */}
+          <Hidden sm md lg xl>
+            <Col style={{ width: this.state.showSidebarMenu ? '280px' : '0px' }} className="sidenav">
+                <HeaderMenu onClose={this.hideSidebarMenu} currentRole={this.state.currentRole} />
+            </Col>
+          </Hidden>
 
           <div className="app">
             <NotificationSystem ref="notificationSystem" />
 
-            <Header onMenuButton={this.showSidebarMenu} showMenuButton={this.state.token != null} />
+            <Header onMenuButton={this.showSidebarMenu} showMenuButton={false} />
 
             <div className={`app-body app-body-spacing`} >
-              <Col xsHidden>
+              <Col xs={false}>
                 <SidebarMenu currentRole={this.state.currentRole} />
               </Col>
 
diff --git a/src/containers/login.js b/src/containers/login.js
index ee613a6..93afa80 100644
--- a/src/containers/login.js
+++ b/src/containers/login.js
@@ -42,7 +42,8 @@ class Login extends Component {
     return {
       currentUser: UserStore.getState().currentUser,
       token: UserStore.getState().token,
-      loginMessage: UserStore.getState().loginMessage
+      loginMessage: UserStore.getState().loginMessage,
+      userid: UserStore.getState().userid
     };
   }
 
@@ -54,11 +55,13 @@ class Login extends Component {
     // if token stored locally, request user
     if (nextState.token == null) {
       const token = localStorage.getItem('token');
+      const userid = localStorage.getItem('userid');
 
       if (token != null && token !== '' && nextState.currentUser == null) {
         AppDispatcher.dispatch({
           type: 'users/logged-in',
-          token: token
+          token: token,
+          userid: userid
         });
       }
     } else {
@@ -66,6 +69,7 @@ class Login extends Component {
       if (nextState.currentUser != null) {
         // save login in local storage
         localStorage.setItem('token', nextState.token);
+        localStorage.setItem('userid', nextState.userid);
       }
     }
   }
diff --git a/src/containers/select-simulator.js b/src/containers/select-simulator.js
index 88f7151..4b69ff1 100644
--- a/src/containers/select-simulator.js
+++ b/src/containers/select-simulator.js
@@ -46,7 +46,7 @@ class SelectSimulator extends React.Component {
         let selectedSimulator = nextProps.value;
         if (selectedSimulator == null) {
             if (this.state.simulators.length > 0) {
-                selectedSimulator = this.state.simulators[0]._id;
+                selectedSimulator = this.state.simulators[0].id;
             } else {
                 selectedSimulator = '';
             }
@@ -60,7 +60,7 @@ class SelectSimulator extends React.Component {
 
         // send complete simulator to callback
         if (this.props.onChange != null) {
-            const simulator = this.state.simulators.find(s => s._id === event.target.value);
+            const simulator = this.state.simulators.find(s => s.id === event.target.value);
 
             this.props.onChange(simulator);
         }
diff --git a/src/containers/simulation.js b/src/containers/simulation.js
index 9f9a0f3..7a66ea1 100644
--- a/src/containers/simulation.js
+++ b/src/containers/simulation.js
@@ -101,7 +101,7 @@ class Simulation extends React.Component {
     const simulationModel = {
       simulation: this.state.simulation._id,
       name: 'New Simulation Model',
-      simulator: this.state.simulators.length > 0 ? this.state.simulators[0]._id : null,
+      simulator: this.state.simulators.length > 0 ? this.state.simulators[0].id : null,
       outputLength: 1,
       outputMapping: [{ name: 'Signal', type: 'Type' }],
       inputLength: 1,
@@ -165,7 +165,7 @@ class Simulation extends React.Component {
 
   getSimulatorName(simulatorId) {
     for (let simulator of this.state.simulators) {
-      if (simulator._id === simulatorId) {
+      if (simulator.id === simulatorId) {
         return _.get(simulator, 'properties.name') || _.get(simulator, 'rawProperties.name') ||  simulator.uuid;
       }
     }
diff --git a/src/containers/simulators.js b/src/containers/simulators.js
index 20fb207..7972dfb 100644
--- a/src/containers/simulators.js
+++ b/src/containers/simulators.js
@@ -66,12 +66,15 @@ class Simulators extends Component {
 
   static calculateState() {
     const simulators = SimulatorStore.getState().sort((a, b) => {
-      if (a.state !== b.state)
-        return this.statePrio(a.state) > this.statePrio(b.state);
-      else if (a.name !== b.name)
+      if (a.state !== b.state) {
+          return Simulators.statePrio(a.state) > Simulators.statePrio(b.state);
+      }
+      else if (a.name !== b.name) {
         return a.name < b.name;
-      else
+      }
+      else {
         return a.stateUpdatedAt < b.stateUpdatedAt;
+      }
     });
 
     return {
@@ -123,6 +126,9 @@ class Simulators extends Component {
 
     if (data) {
       let simulator = this.state.simulators[this.state.modalIndex];
+      console.log("modalIndex: " + this.state.modalIndex);
+      console.log("Simulator Host:" + simulator.host);
+      console.log("Simulator at index 1: " + this.state.simulators[1].host)
       simulator.properties = data;
       this.setState({ simulator });
 
@@ -151,7 +157,7 @@ class Simulators extends Component {
   exportSimulator(index) {
     // filter properties
     let simulator = Object.assign({}, this.state.simulators[index]);
-    delete simulator._id;
+    delete simulator.id;
 
     // show save dialog
     const blob = new Blob([JSON.stringify(simulator, null, 2)], { type: 'application/json' });
@@ -206,7 +212,7 @@ class Simulators extends Component {
     }
   }
 
-  isSimulatorOutdated(simulator) {
+  static isSimulatorOutdated(simulator) {
     if (!simulator.stateUpdatedAt)
       return true;
 
@@ -215,10 +221,10 @@ class Simulators extends Component {
     return Date.now() - new Date(simulator.stateUpdatedAt) > fiveMinutes;
   }
 
-  stateLabelStyle = (state, simulator) => {
+  static stateLabelStyle(state, simulator){
     var style = [ 'label' ];
 
-    if (this.isSimulatorOutdated(simulator) && state !== 'shutdown') {
+    if (Simulators.isSimulatorOutdated(simulator) && state !== 'shutdown') {
       style.push('label-outdated');
     }
 
@@ -250,7 +256,7 @@ class Simulators extends Component {
     return style.join(' ');
   }
 
-  stateUpdateModifier = updatedAt => {
+  static stateUpdateModifier(updatedAt) {
     const date = new Date(updatedAt);
 
     return date.toLocaleString('de-DE');
@@ -268,15 +274,15 @@ class Simulators extends Component {
         <Table data={this.state.simulators}>
           <TableColumn checkbox onChecked={(index, event) => this.onSimulatorChecked(index, event)} width='30' />
           <TableColumn title='Name' dataKeys={['properties.name', 'rawProperties.name']} />
-          <TableColumn title='State' labelKey='state' tooltipKey='error' labelModifier={this.stateLabelModifier} labelStyle={this.stateLabelStyle} />
+          <TableColumn title='State' labelKey='state' tooltipKey='error' labelModifier={Simulators.stateLabelModifier} labelStyle={Simulators.stateLabelStyle} />
           <TableColumn title='Category' dataKeys={['properties.category', 'rawProperties.category']} />
           <TableColumn title='Type' dataKeys={['properties.type', 'rawProperties.type']} />
           <TableColumn title='Location' dataKeys={['properties.location', 'rawProperties.location']} />
           {/* <TableColumn title='Realm' dataKeys={['properties.realm', 'rawProperties.realm']} /> */}
           <TableColumn title='Host' dataKey='host' />
-          <TableColumn title='Last Update' dataKey='stateUpdatedAt' modifier={this.stateUpdateModifier} />
+          <TableColumn title='Last Update' dataKey='stateUpdatedAt' modifier={Simulators.stateUpdateModifier} />
           <TableColumn
-            width='100'
+            width='200'
             editButton
             exportButton
             deleteButton
diff --git a/src/containers/users.js b/src/containers/users.js
index 59cb5af..ecb9364 100644
--- a/src/containers/users.js
+++ b/src/containers/users.js
@@ -102,7 +102,7 @@ class Users extends Component {
   }
 
   getHumanRoleName(role_key) {
-    const HUMAN_ROLE_NAMES = {admin: 'Administrator', user: 'User', guest: 'Guest'};
+    const HUMAN_ROLE_NAMES = {Admin: 'Administrator', User: 'User', Guest: 'Guest'};
 
     return HUMAN_ROLE_NAMES.hasOwnProperty(role_key)? HUMAN_ROLE_NAMES[role_key] : '';
   }
diff --git a/src/data-managers/rest-data-manager.js b/src/data-managers/rest-data-manager.js
index 321a542..b667ac0 100644
--- a/src/data-managers/rest-data-manager.js
+++ b/src/data-managers/rest-data-manager.js
@@ -114,7 +114,7 @@ class RestDataManager {
   }
 
   remove(object, token = null) {
-    RestAPI.delete(this.makeURL(this.url + '/' + object._id), token).then(response => {
+    RestAPI.delete(this.makeURL(this.url + '/' + object.id), token).then(response => {
       AppDispatcher.dispatch({
         type: this.type + 's/removed',
         data: response[this.type],
@@ -132,7 +132,7 @@ class RestDataManager {
     var obj = {};
     obj[this.type] = this.filterKeys(object);
 
-    RestAPI.put(this.makeURL(this.url + '/' + object._id), obj, token).then(response => {
+    RestAPI.put(this.makeURL(this.url + '/' + object.id), obj, token).then(response => {
       AppDispatcher.dispatch({
         type: this.type + 's/edited',
         data: response[this.type]
diff --git a/src/data-managers/simulators-data-manager.js b/src/data-managers/simulators-data-manager.js
index df45f34..4c34f51 100644
--- a/src/data-managers/simulators-data-manager.js
+++ b/src/data-managers/simulators-data-manager.js
@@ -30,7 +30,7 @@ class SimulatorsDataManager extends RestDataManager {
 
     doActions(simulator, action, token = null) {
         // TODO: Make only simulator id dependent
-        RestAPI.post(this.makeURL(this.url + '/' + simulator._id), action, token).then(response => {
+        RestAPI.post(this.makeURL(this.url + '/' + simulator.id), action, token).then(response => {
             AppDispatcher.dispatch({
                 type: 'simulators/action-started',
                 data: response
diff --git a/src/data-managers/users-data-manager.js b/src/data-managers/users-data-manager.js
index 07d1b12..692b18b 100644
--- a/src/data-managers/users-data-manager.js
+++ b/src/data-managers/users-data-manager.js
@@ -33,7 +33,8 @@ class UsersDataManager extends RestDataManager {
       AppDispatcher.dispatch({
         type: 'users/logged-in',
         token: response.token,
-        user: response.user
+        user: response.user,
+        userid: response.user.id
       });
     }).catch(error => {
       AppDispatcher.dispatch({
@@ -43,19 +44,19 @@ class UsersDataManager extends RestDataManager {
     });
   }
 
-  //getCurrentUser(token) {
-  //  RestAPI.get(this.makeURL('/users/me'), token).then(response => {
-  //    AppDispatcher.dispatch({
-  //      type: 'users/current-user',
-  //      user: response.user
-  //    });
-  //  }).catch(error => {
-  //    AppDispatcher.dispatch({
-  //      type: 'users/current-user-error',
-  //      error: error
-  //    });
-  //  });
-  //}
+  getCurrentUser(token, id) {
+    RestAPI.get(this.makeURL('/users/' + id), token).then(response => {
+      AppDispatcher.dispatch({
+        type: 'users/current-user',
+        user: response.user
+      });
+    }).catch(error => {
+      AppDispatcher.dispatch({
+        type: 'users/current-user-error',
+        error: error
+      });
+    });
+  }
   
 }
 
diff --git a/src/stores/array-store.js b/src/stores/array-store.js
index ccd9689..2d4be7c 100644
--- a/src/stores/array-store.js
+++ b/src/stores/array-store.js
@@ -39,7 +39,7 @@ class ArrayStore extends ReduceStore {
     // search for existing element to update
     state.forEach((element, index, array) => {
       newElements = newElements.filter((updateElement, newIndex) => {
-        if (element._id === updateElement._id) {
+        if (element.id === updateElement.id) {
           // update each property
           for (var key in updateElement) {
             if (updateElement.hasOwnProperty(key)) {
diff --git a/src/stores/simulator-store.js b/src/stores/simulator-store.js
index 00b8635..03ecf73 100644
--- a/src/stores/simulator-store.js
+++ b/src/stores/simulator-store.js
@@ -38,7 +38,7 @@ class SimulatorStore extends ArrayStore {
           const endpoint = _.get(simulator, 'properties.endpoint') || _.get(simulator, 'rawProperties.endpoint');
 
           if (endpoint != null && endpoint !== '') {
-            SimulatorDataDataManager.open(endpoint, simulator._id);
+            SimulatorDataDataManager.open(endpoint, simulator.id);
           } else {
             // console.warn('Endpoint not found for simulator at ' + endpoint);
             // console.log(simulator);
@@ -53,7 +53,8 @@ class SimulatorStore extends ArrayStore {
         const endpoint = _.get(simulator, 'properties.endpoint') || _.get(simulator, 'rawProperties.endpoint');
 
         if (endpoint != null && endpoint !== '') {
-          SimulatorDataDataManager.update(endpoint, simulator._id);
+          console.log("Updating simulatorid " + simulator.id);
+          SimulatorDataDataManager.update(endpoint, simulator.id);
         }
 
         return super.reduce(state, action);
diff --git a/src/stores/user-store.js b/src/stores/user-store.js
index ecaede5..c3c563f 100644
--- a/src/stores/user-store.js
+++ b/src/stores/user-store.js
@@ -35,6 +35,7 @@ class UserStore extends ReduceStore {
       users: [],
       currentUser: null,
       token: null,
+      userid: 0,
       loginMessage: null
     };
   }
@@ -54,14 +55,13 @@ class UserStore extends ReduceStore {
 
       case 'users/logged-in':
         // // request logged-in user data
-        //UsersDataManager.getCurrentUser(action.token);
+        UsersDataManager.getCurrentUser(action.token, action.userid);
 
-        //save token and logged-in user
-        return Object.assign({}, state, { token: action.token, currentUser: action.user  });
+        return Object.assign({}, state, { token: action.token, userid: action.userid});
 
-      //case 'users/current-user':
+      case 'users/current-user':
       //  // save logged-in user
-      //  return Object.assign({}, state, { currentUser: action.user });
+        return Object.assign({}, state, { currentUser: action.user});
 
       case 'users/current-user-error':
         // discard user token