diff --git a/src/js/components/core/SideBar/SideBarContainer.js b/src/js/components/core/SideBar/SideBarContainer.js
index 73931075d6..48d6bd183c 100644
--- a/src/js/components/core/SideBar/SideBarContainer.js
+++ b/src/js/components/core/SideBar/SideBarContainer.js
@@ -68,7 +68,7 @@ class SideBarContainer extends React.Component{
 
   render(){
     let sideBarContent;
-    if(this.state.SideNavBar){
+    if(this.state.SideNavBar || this.props.initShow){
       sideBarContent = <div>
                           <SideNavBar /><br />
                           <div style={{bottom: "0px", position: "absolute"}}>
diff --git a/src/js/components/core/login/Login.js b/src/js/components/core/login/Login.js
index bf3c1fbc64..de9c709e67 100644
--- a/src/js/components/core/login/Login.js
+++ b/src/js/components/core/login/Login.js
@@ -37,14 +37,13 @@ class Login extends React.Component {
         _this.props.success();
       }
     }).catch(function(reason) {
-      //console.log(reason);
+      console.log(reason);
       if (reason.status === 401) {
-        dialog.showErrorBox('Login Failed', 'Incorrect username or password');
-      } else if (reason.hasOwnProperty('message')) {
+        dialog.showErrorBox('Login Failed', 'Incorrect username or password. This could be caused by using an email address instead of a username.');
+      } else if (reason.message) {
         dialog.showErrorBox('Login Failed', reason.message);
-      } else if (reason.hasOwnProperty('data')) {
-        let errorMessage = reason.data;
-        dialog.showErrorBox('Login Failed', errorMessage);
+      } else if (reason.data) {
+        dialog.showErrorBox('Login Failed', reason.data);
       } else {
         dialog.showErrorBox('Login Failed', 'Unknown Error');
       }
diff --git a/src/js/components/core/welcome/welcome.js b/src/js/components/core/welcome/welcome.js
index ca26021aa0..1317ed8e77 100644
--- a/src/js/components/core/welcome/welcome.js
+++ b/src/js/components/core/welcome/welcome.js
@@ -6,6 +6,9 @@ const CoreActions = require('../../../actions/CoreActions.js');
 const ProjectModal = require('../create_project/ProjectModal');
 
 const Login = require('../login/Login');
+const StatusBar = require('../SideBar/StatusBar');
+const SideBarContainer = require('../SideBar/SideBarContainer');
+
 const Upload = require('../Upload');
 const loadOnline = require('../LoadOnline');
 const SideNavBar = require('../SideBar/SideNavBar');
@@ -152,8 +155,8 @@ class Welcome extends React.Component{
           <Popover
             id="accountSettings"
             placement="right"
-            positionLeft={88}
-            positionTop={15}
+            positionLeft={115}
+            positionTop={28}
             title="Door43 Login">
             <div style={Styles.tutorialPopover}>
               <p>Clicking this button allows you to log in or log out to your Door43 account. Additionally giving you access to more information about your account.</p>
@@ -170,13 +173,13 @@ class Welcome extends React.Component{
       case 2:
         return(
           <Popover
-            id="openProject"
+            id="syncProject"
             placement="right"
-            positionLeft={88}
-            positionTop={105}
-            title="Load in a Project">
+            positionLeft={115}
+            positionTop={125}
+            title="Sync Your Work To Door43">
             <div style={Styles.tutorialPopover}>
-              <p>Clicking this button allows you to import your own or someone else's translationStudio project as well as open an existing translationCore project.</p>
+              <p>Clicking this button allows you to save or update a copy of your project to your Door43 account.</p>
             </div>
             <Button
               style={Styles.nextTutorialButton}
@@ -190,19 +193,19 @@ class Welcome extends React.Component{
       case 3:
         return(
           <Popover
-            id="syncProject"
+            id="generateReport"
             placement="right"
-            positionLeft={88}
-            positionTop={202}
-            title="Sync Your Work To Door43">
+            positionLeft={115}
+            positionTop={192}
+            title="Generating a Report">
             <div style={Styles.tutorialPopover}>
-              <p>Clicking this button allows you to save or update a copy of your project to your Door43 account.</p>
+              <p>Clicking this button allows you to generate a report for all of the checks performed in the currently opened project.</p>
             </div>
             <Button
               style={Styles.nextTutorialButton}
               onClick={() => {_this.setState({tutorialIndex: this.state.tutorialIndex+1})}}
               bsStyle="link">
-              {'Next'} <Glyphicon glyph="chevron-right" />
+            {'Next'} <Glyphicon glyph="chevron-right" />
             </Button>
           </Popover>
         )
@@ -210,13 +213,13 @@ class Welcome extends React.Component{
       case 4:
         return(
           <Popover
-            id="generateReport"
+            id="appSettings"
             placement="right"
-            positionLeft={88}
-            positionTop={285}
-            title="Generating a Report">
+            positionLeft={115}
+            positionTop={255}
+            title="Settings">
             <div style={Styles.tutorialPopover}>
-              <p>Clicking this button allows you to generate a report for all of the checks performed in the currently opened project.</p>
+              <p>Clicking this button allows you to access various settings options to make translationCore look and perform according to your needs.</p>
             </div>
             <Button
               style={Styles.nextTutorialButton}
@@ -230,13 +233,13 @@ class Welcome extends React.Component{
       case 5:
         return(
           <Popover
-            id="loadApp"
+            id="toolBox"
             placement="right"
-            positionLeft={88}
-            positionTop={379}
-            title="Selecting a Tool to perform a Check">
+            positionLeft={115}
+            positionTop={349}
+            title="Toolbox">
             <div style={Styles.tutorialPopover}>
-              <p>Clicking this button allows you to start using a tool to perform a check on your project draft.</p>
+              <p>Clicking this button allows you to download, update or remove tools to perform different types of checks.</p>
             </div>
             <Button
               style={Styles.nextTutorialButton}
@@ -250,13 +253,13 @@ class Welcome extends React.Component{
       case 6:
         return(
           <Popover
-            id="appSettings"
+            id="openProject"
             placement="right"
-            positionLeft={88}
-            positionTop={440}
-            title="Settings">
+            positionLeft={115}
+            positionTop={window.innerHeight-250}
+            title="Load in a Project">
             <div style={Styles.tutorialPopover}>
-              <p>Clicking this button allows you to access various settings options to make translationCore look and perform according to your needs.</p>
+              <p>{"Clicking this button allows you to import your own or someone else's translationStudio project as well as open an existing translationCore project."}</p>
             </div>
             <Button
               style={Styles.nextTutorialButton}
@@ -270,13 +273,13 @@ class Welcome extends React.Component{
       case 7:
         return(
           <Popover
-            id="toolBox"
+            id="loadApp"
             placement="right"
-            positionLeft={88}
-            positionTop={551}
-            title="Tool Box">
+            positionLeft={115}
+            positionTop={window.innerHeight-150}
+            title="Selecting a Tool to perform a Check">
             <div style={Styles.tutorialPopover}>
-              <p>Clicking this button allows you to download, update or remove tools to perform different types of checks.</p>
+              <p>Clicking this button allows you to start using a tool to perform a check on your project draft.</p>
             </div>
             <Button
               style={Styles.nextTutorialButton}
@@ -303,7 +306,8 @@ class Welcome extends React.Component{
     }else if(this.state.tutorial){
       return(
         <div style={Styles.tutorialPage}>
-          <SideNavBar />
+         <StatusBar />
+         <SideBarContainer initShow={true}/>
           {this.getTutorialOverlay(this.state.tutorialIndex)}
           <Button
             style={Styles.skipTutorialButton}
diff --git a/src/js/pages/app.js b/src/js/pages/app.js
index 9e0a16a7d8..8134aac800 100644
--- a/src/js/pages/app.js
+++ b/src/js/pages/app.js
@@ -32,7 +32,7 @@ const Upload = require('../components/core/Upload');
 var Main = React.createClass({
   getInitialState() {
     var tutorialState = api.getSettings('showTutorial');
-    if (tutorialState == 'true' || tutorialState === null) {
+    if (tutorialState === true || tutorialState === null) {
       return ({
         firstTime: true
       })
@@ -49,7 +49,7 @@ var Main = React.createClass({
       localStorage.removeItem('lastProject');
       api.setSettings('showTutorial', false);
     }
-    
+
     if (localStorage.getItem('user')) {
       var phrase = api.getAuthToken('phrase') != undefined ? api.getAuthToken('phrase') : "tc-core";
       var decrypted = CryptoJS.AES.decrypt(localStorage.getItem('user'), phrase);