diff --git a/mobile/ios/DeightonAR/Info.plist b/mobile/ios/DeightonAR/Info.plist
index 5c4bf03..f0f6f32 100644
--- a/mobile/ios/DeightonAR/Info.plist
+++ b/mobile/ios/DeightonAR/Info.plist
@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>20180407.3</string>
+	<string>20180408.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSAppTransportSecurity</key>
diff --git a/mobile/src/API.js b/mobile/src/API.js
index d4f7092..156a0c0 100644
--- a/mobile/src/API.js
+++ b/mobile/src/API.js
@@ -2,21 +2,14 @@ import EventEmitter from "eventemitter3"
 import io from "socket.io-client"
 import { AsyncStorage } from "react-native"
 
-const authTokenName = "AuthToken"
-const backendName = "backendName"
+const authTokenKeyName = "AuthToken"
+const backendKeyName = "BackendName"
 
-let baseURL = null
-let apiPath = null
-//
-if (__DEV__) {
-  const localIPAddr = process.env.LOCAL_IP_ADDR
-
-  baseURL = `http://${localIPAddr || "localhost"}:3001`
-  apiPath = ""
-} else {
-  baseURL = "https://dar.kss.us.com"
-  apiPath = "/api"
-}
+// if (__DEV__) {
+//   const localIPAddr = process.env.LOCAL_IP_ADDR
+//   baseURL = `http://${localIPAddr || "localhost"}:3001`
+//   apiPath = ""
+// }
 
 class NetworkError extends Error {
   constructor(message) {
@@ -48,16 +41,20 @@ class API extends EventEmitter {
     super()
     this.user = { pending: true }
 
-    AsyncStorage.getItem(backendName)
-      .then((backend) => {
-        this.backend = backend
-      })
-      .catch((err) => {
-        this.backend = "normal"
-        AsyncStorage.setItem(backendName, this.backend)
-      })
+    // AsyncStorage.getItem(backendKeyName)
+    //   .then((backend) => {
+    //     this.backend = backend
+    //   })
+    //   .catch((err) => {
+    //     this.backend = "normal"
+    //     AsyncStorage.setItem(backendKeyName, this.backend)
+    //   })
 
-    AsyncStorage.getItem(authTokenName)
+    this.backendName = "normal"
+    this.baseURL = "https://dar.kss.us.com"
+    this.apiPath = "/api"
+
+    AsyncStorage.getItem(authTokenKeyName)
       .then((token) => {
         if (!token) {
           return Promise.reject()
@@ -72,7 +69,7 @@ class API extends EventEmitter {
         this.emit("login")
       })
       .catch((err) => {
-        AsyncStorage.removeItem(authTokenName)
+        AsyncStorage.removeItem(authTokenKeyName)
         this.token = null
         this.user = {}
         this.socket = null
@@ -81,8 +78,8 @@ class API extends EventEmitter {
   }
 
   connectSocket() {
-    this.socket = io(baseURL, {
-      path: apiPath + "/socketio",
+    this.socket = io(this.baseURL, {
+      path: this.apiPath + "/socketio",
       query: {
         auth_token: this.token,
       },
@@ -117,14 +114,14 @@ class API extends EventEmitter {
   }
 
   get backend() {
-    return this.backend
+    return this.backendName
   }
 
   makeImageUrl(id, size) {
     if (id) {
-      return apiPath + "/assets/" + id + "?access_token=" + this.token
+      return this.apiPath + "/assets/" + id + "?access_token=" + this.token
     } else if (size && size.width && size.height) {
-      return `${apiPath}/placeholders/${size.width}x${
+      return `${this.apiPath}/placeholders/${size.width}x${
         size.height
       }?access_token=${this.token}`
     } else {
@@ -133,7 +130,9 @@ class API extends EventEmitter {
   }
 
   makeAssetUrl(id) {
-    return id ? apiPath + "/assets/" + id + "?access_token=" + this.token : null
+    return id
+      ? this.apiPath + "/assets/" + id + "?access_token=" + this.token
+      : null
   }
 
   static makeParams(params) {
@@ -169,7 +168,7 @@ class API extends EventEmitter {
         }
       }
       fetchOptions.headers = headers
-      fetch(this.apiURL + path, fetchOptions)
+      fetch(this.baseURL + this.apiPath + path, fetchOptions)
         .then((res) => {
           return Promise.all([
             Promise.resolve(res),
@@ -221,7 +220,7 @@ class API extends EventEmitter {
           }
 
           if (remember) {
-            AsyncStorage.setItem(authTokenName, token)
+            AsyncStorage.setItem(authTokenKeyName, token)
           }
           this.token = token
           this.user = response.body
@@ -237,7 +236,7 @@ class API extends EventEmitter {
   logout() {
     let cb = () => {
       // Regardless of response, always logout in the client
-      AsyncStorage.removeItem(authTokenName)
+      AsyncStorage.removeItem(authTokenKeyName)
       this.token = null
       this.user = {}
       this.disconnectSocket()
diff --git a/mobile/src/Auth/Login.js b/mobile/src/Auth/Login.js
index a9b3590..571f56e 100644
--- a/mobile/src/Auth/Login.js
+++ b/mobile/src/Auth/Login.js
@@ -173,7 +173,7 @@ export class Login extends React.Component {
               color: "lightgray",
               fontSize: 10,
             }}>
-            {versionInfo.version}
+            {versionInfo.fullVersion}
           </Text>
         </View>
         <MessageModal
diff --git a/mobile/src/Modal/ApiModal.js b/mobile/src/Modal/ApiModal.js
index a5e7bdd..e4b4947 100644
--- a/mobile/src/Modal/ApiModal.js
+++ b/mobile/src/Modal/ApiModal.js
@@ -4,6 +4,7 @@ import PropTypes from "prop-types"
 import { View, Text, TouchableOpacity } from "react-native"
 import { Icon, OptionStrip } from "../ui"
 import autobind from "autobind-decorator"
+import { api } from "../API"
 
 export class ApiModal extends Component {
   static propTypes = {
@@ -14,7 +15,7 @@ export class ApiModal extends Component {
   constructor(props) {
     super(props)
     this.state = {
-      value: null,
+      value: api.backend,
     }
   }
 
diff --git a/mobile/src/version.js b/mobile/src/version.js
index 99c5cc3..a112728 100644
--- a/mobile/src/version.js
+++ b/mobile/src/version.js
@@ -1,6 +1,6 @@
 export const versionInfo = {
   version: '1.0.0',
-  fullVersion: '1.0.0-20180407.3',
+  fullVersion: '1.0.0-20180408.0',
   title: 'Deighton AR System',
   copyright: '© 2018, Kingston Software Solutions.',
   supportEmail: 'support@kss.us.com',
diff --git a/version.json5 b/version.json5
index cd7953a..cd11dde 100644
--- a/version.json5
+++ b/version.json5
@@ -15,8 +15,8 @@
     major: 1,
     minor: 0,
     patch: 0,
-    build: 20180407,
-    revision: 3,
+    build: 20180408,
+    revision: 0,
     sequence: 1,
     tz: "America/Los_Angeles",
     title: "Deighton AR System",
diff --git a/website/.eslintrc b/website/.eslintrc
index 79816af..701599a 100644
--- a/website/.eslintrc
+++ b/website/.eslintrc
@@ -20,9 +20,10 @@
   },
   "rules": {
     "key-spacing": 0,
-    "jsx-quotes": [2, "prefer-single"],
     "object-curly-spacing": [2, "always"],
     "space-before-function-paren": ["error", "never"],
-    "comma-dangle": ["error", "only-multiline"]
+    "comma-dangle": ["error", "only-multiline"],
+    "jsx-quotes": "off",
+    "quotes": "off"
   }
 }
diff --git a/website/src/App.js b/website/src/App.js
index 12609af..6989329 100644
--- a/website/src/App.js
+++ b/website/src/App.js
@@ -1,18 +1,26 @@
-import React, { Component, Fragment } from 'react'
-import { Login, Logout, ResetPassword, ForgotPassword, ConfirmEmail, ProtectedRoute, DefaultRoute } from './Auth'
-import { Home } from './Home'
-import { Profile } from './Profile'
-import { Users } from './Users'
-import { Teams } from './Teams'
-import { System } from './System'
-import { HeaderButton, HeaderText, Column, Row, Text, Box } from 'ui'
-import { BrowserRouter as Router, Route, Switch } from 'react-router-dom'
-import logoImage from 'images/logo.png'
-import { versionInfo } from './version'
-import { sizeInfo, colorInfo } from 'ui/style'
-import { api } from 'src/API'
-import PropTypes from 'prop-types'
-import autobind from 'autobind-decorator'
+import React, { Component, Fragment } from "react"
+import {
+  Login,
+  Logout,
+  ResetPassword,
+  ForgotPassword,
+  ConfirmEmail,
+  ProtectedRoute,
+  DefaultRoute,
+} from "./Auth"
+import { Home } from "./Home"
+import { Profile } from "./Profile"
+import { Users } from "./Users"
+import { Teams } from "./Teams"
+import { System } from "./System"
+import { HeaderButton, HeaderText, Column, Row, Text, Box } from "ui"
+import { BrowserRouter as Router, Route, Switch } from "react-router-dom"
+import logoImage from "images/logo.png"
+import { versionInfo } from "./version"
+import { sizeInfo, colorInfo } from "ui/style"
+import { api } from "src/API"
+import PropTypes from "prop-types"
+import autobind from "autobind-decorator"
 
 export class App extends Component {
   static propTypes = {
@@ -22,18 +30,18 @@ export class App extends Component {
   constructor(props) {
     super(props)
     this.state = {
-      loggedInUser: api.loggedInUser
+      loggedInUser: api.loggedInUser,
     }
   }
 
   componentDidMount() {
-    api.addListener('login', this.handleUpdate)
-    api.addListener('logout', this.handleUpdate)
+    api.addListener("login", this.handleUpdate)
+    api.addListener("logout", this.handleUpdate)
   }
 
   componentWillUnmount() {
-    api.removeListener('login', this.handleUpdate)
-    api.removeListener('logout', this.handleUpdate)
+    api.removeListener("login", this.handleUpdate)
+    api.removeListener("logout", this.handleUpdate)
   }
 
   @autobind
@@ -43,15 +51,15 @@ export class App extends Component {
 
   handleLogout() {
     // We have to use window here because App does not have history in it's props
-    window.location.replace('/logout')
+    window.location.replace("/logout")
   }
 
   handleHome() {
-    window.location.replace('/')
+    window.location.replace("/")
   }
 
   handleProfile() {
-    window.location.replace('/profile')
+    window.location.replace("/profile")
   }
 
   @autobind
@@ -73,20 +81,25 @@ export class App extends Component {
       )
       headerButtonsRight = (
         <Fragment>
-          <HeaderButton icon='profile' onClick={this.handleProfile} />
-          <HeaderButton icon='logout' onClick={this.handleLogout} />
+          <HeaderButton icon="profile" onClick={this.handleProfile} />
+          <HeaderButton icon="logout" onClick={this.handleLogout} />
         </Fragment>
       )
     }
 
     return (
-      <Router basename='/'>
-        <Column minHeight='100vh'>
-          <Column.Item height={sizeInfo.headerHeight - sizeInfo.headerBorderWidth}>
-            <Box background={colorInfo.headerButtonBackground}
-              borderBottom={{ width: sizeInfo.headerBorderWidth, color: colorInfo.headerBorder }}
-              style={{ boxSizing: 'content' }}>
-              <Row minWidth='100vw'>
+      <Router basename="/">
+        <Column minHeight="100vh">
+          <Column.Item
+            height={sizeInfo.headerHeight - sizeInfo.headerBorderWidth}>
+            <Box
+              background={colorInfo.headerButtonBackground}
+              borderBottom={{
+                width: sizeInfo.headerBorderWidth,
+                color: colorInfo.headerBorder,
+              }}
+              style={{ boxSizing: "content" }}>
+              <Row minWidth="100vw">
                 <Row.Item>{headerButtonsLeft}</Row.Item>
                 <Row.Item grow />
                 <Row.Item>{headerButtonsRight}</Row.Item>
@@ -94,21 +107,62 @@ export class App extends Component {
             </Box>
           </Column.Item>
           <Switch>
-            <Route exact path='/login' component={Login} />
-            <Route exact path='/logout' component={Logout} />
-            <Route exact path='/confirm-email' component={ConfirmEmail} />
-            <Route exact path='/reset-password' component={ResetPassword} />
-            <Route exact path='/forgot-password' component={ForgotPassword} />
-            <ProtectedRoute exact path='/profile' render={props => (<Profile {...props} changeTitle={this.handleChangeTitle} />)} />
-            <ProtectedRoute exact admin path='/users' render={props => (<Users {...props} changeTitle={this.handleChangeTitle} />)} />
-            <ProtectedRoute exact admin path='/teams' render={props => (<Teams {...props} changeTitle={this.handleChangeTitle} />)} />
-            <ProtectedRoute exact admin path='/system' render={props => (<System {...props} changeTitle={this.handleChangeTitle} />)} />
-            <ProtectedRoute exact admin path='/home' render={props => (<Home {...props} changeTitle={this.handleChangeTitle} />)} />
+            <Route exact path="/login" component={Login} />
+            <Route exact path="/logout" component={Logout} />
+            <Route exact path="/confirm-email" component={ConfirmEmail} />
+            <Route exact path="/reset-password" component={ResetPassword} />
+            <Route exact path="/forgot-password" component={ForgotPassword} />
+            <ProtectedRoute
+              exact
+              path="/profile"
+              render={(props) => (
+                <Profile {...props} changeTitle={this.handleChangeTitle} />
+              )}
+            />
+            <ProtectedRoute
+              exact
+              admin
+              path="/users"
+              render={(props) => (
+                <Users {...props} changeTitle={this.handleChangeTitle} />
+              )}
+            />
+            <ProtectedRoute
+              exact
+              admin
+              path="/teams"
+              render={(props) => (
+                <Teams {...props} changeTitle={this.handleChangeTitle} />
+              )}
+            />
+            <ProtectedRoute
+              exact
+              admin
+              path="/system"
+              render={(props) => (
+                <System {...props} changeTitle={this.handleChangeTitle} />
+              )}
+            />
+            <ProtectedRoute
+              exact
+              admin
+              path="/home"
+              render={(props) => (
+                <Home {...props} changeTitle={this.handleChangeTitle} />
+              )}
+            />
             <DefaultRoute />
           </Switch>
           <Column.Item>
-            <Box background={colorInfo.headerButtonBackground} borderTop={{ width: sizeInfo.headerBorderWidth, color: colorInfo.headerBorder }}>
-              <Text color='dimmed' margin={sizeInfo.footerTextMargin}>{'v' + versionInfo.version} {versionInfo.copyright}</Text>
+            <Box
+              background={colorInfo.headerButtonBackground}
+              borderTop={{
+                width: sizeInfo.headerBorderWidth,
+                color: colorInfo.headerBorder,
+              }}>
+              <Text color="dimmed" margin={sizeInfo.footerTextMargin}>
+                {"v" + versionInfo.fullVersion} {versionInfo.copyright}
+              </Text>
             </Box>
           </Column.Item>
         </Column>
diff --git a/website/src/version.js b/website/src/version.js
index 99c5cc3..a112728 100644
--- a/website/src/version.js
+++ b/website/src/version.js
@@ -1,6 +1,6 @@
 export const versionInfo = {
   version: '1.0.0',
-  fullVersion: '1.0.0-20180407.3',
+  fullVersion: '1.0.0-20180408.0',
   title: 'Deighton AR System',
   copyright: '© 2018, Kingston Software Solutions.',
   supportEmail: 'support@kss.us.com',