diff --git a/src/ui/components/ConceptCard.js b/src/ui/components/ConceptCard.js
index 118f8093..0a71dde8 100644
--- a/src/ui/components/ConceptCard.js
+++ b/src/ui/components/ConceptCard.js
@@ -49,10 +49,10 @@ class ConceptCard extends Component {
 				<Card>
 					<CardContent>
 						<div>
-						<div style={{display: 'flex'}}>
+						<div style={{display: 'flex', cursor: "pointer"}} onClick={evt => this.handleExpandClick()}>
 							{this.state.expand ?
-							<ExpandedIcon style={{cursor: "pointer"}} onClick={evt => this.handleExpandClick()} /> :
-              <ExpandMoreIcon style={{cursor: 'pointer'}} onClick={evt => this.handleExpandClick()}/>
+							<ExpandedIcon /> :
+              <ExpandMoreIcon />
 							}
 							<p style={titleStyle}>{this.props.title}</p>
 						</div>
diff --git a/src/ui/components/Navbar.js b/src/ui/components/Navbar.js
index 2b236f8d..05dcfbde 100644
--- a/src/ui/components/Navbar.js
+++ b/src/ui/components/Navbar.js
@@ -16,7 +16,9 @@ import MenuItem from '@material-ui/core/MenuItem/MenuItem';
  */
 
 type Props = {
-  firebaseUser: ?FirebaseUser
+  firebaseUser: ?FirebaseUser,
+  display: string,
+  switchToWorldView: Function
 }
 
 class Navbar extends Component {
@@ -56,9 +58,19 @@ class Navbar extends Component {
         <div>
           <AppBar>
             <Toolbar>
-              <Typography style={{flexGrow: 1}} variant={"title"} color={"primary"}>
+              {this.props.display === "EXERCISE" ?
+              <div style={{marginRight: 5}}><Button onClick={this.props.switchToWorldView}
+                           aria-owns='menu'
+                           aria-haspopup="true"
+                           id="menu-button"
+                           color={"secondary"}>
+                Back to World View
+              </Button></div> : <div></div>
+              }
+              <Typography style={{flexGrow: 1}} variant={"title"} color={"secondary"}>
                   Koconut
               </Typography>
+
               {this.props.firebaseUser &&
               (<div>
                   <Button onClick={(e) => this.handleMenuClick(e)}
diff --git a/src/ui/containers/App.js b/src/ui/containers/App.js
index d29d961f..44c45d5d 100644
--- a/src/ui/containers/App.js
+++ b/src/ui/containers/App.js
@@ -42,6 +42,7 @@ class App extends Component {
   submitTryAgain: Function;
   switchToSignin: Function;
   switchToSignup: Function;
+  switchToWorldView: Function;
   generator: ExerciseGenerator;
   theme: mixed;
   // updater: ResponseEvaluator;
@@ -53,7 +54,7 @@ class App extends Component {
     display: string, // the current display state
     conceptOptions: number, // concept options offered, no options if <= 1
     currentConcept: ?string,
-    firebaseUser: ?FirebaseUser
+    firebaseUser: any
   };
   constructor() {
     super();
@@ -77,6 +78,7 @@ class App extends Component {
     this.submitTryAgain = this.submitTryAgain.bind(this);
     this.switchToSignin = this.switchToSignin.bind(this);
     this.switchToSignup = this.switchToSignup.bind(this);
+    this.switchToWorldView = this.switchToWorldView.bind(this);
   }
   /**
    * Return a generated exercise
@@ -221,6 +223,14 @@ class App extends Component {
 		this.setState({display: displayType.signup});
 	}
 
+  /**
+   * Sets the display state to 'WORLD". This function is passed as a prop
+   * to the the navigationbar.
+   */
+	switchToWorldView() {
+	  this.setState({display: displayType.world});
+  }
+
 	/**
 	 * Renders the welcome view
 	 * @returns {*}
@@ -229,9 +239,13 @@ class App extends Component {
     return (
         <Welcome
             callBack={() => {
-              this.setState({display: displayType.world});
-              var databaseRef = firebase.database().ref("Users/" + this.state.firebaseUser.uid + "/waiverStatus");
-              databaseRef.set(true);
+              if(this.state.firebaseUser) {
+                this.setState({display: displayType.world});
+                var databaseRef = firebase.database().
+                    ref("Users/" + this.state.firebaseUser.uid +
+                        "/waiverStatus");
+                databaseRef.set(true);
+              }
             }}
         firebaseUser={this.state.firebaseUser}
         app={this}/>
@@ -302,24 +316,26 @@ class App extends Component {
     return (
         <div className="App">
           <MuiThemeProvider theme={this.theme}>
-            <Navbar firebaseUser={this.state.firebaseUser} />
+            <Navbar firebaseUser={this.state.firebaseUser}
+                    switchToWorldView={this.switchToWorldView}
+                    display={this.state.display}/>
             <div className="main">
-              {/*<h1 className="title">*/}
-                {/*{this.state.display !== displayType.welcome ?*/}
-                    {/*<span className="debug">*/}
-                  {/*<input*/}
-                      {/*type="button"*/}
-                      {/*onClick={() => this.setState(*/}
-                          {/*{*/}
-                            {/*display: displayType.exercise,*/}
-                            {/*exercise: this._getExercise(),*/}
-                            {/*feedback: '',*/}
-                            {/*counter: this.state.counter + 1,*/}
-                          {/*})}*/}
-                      {/*value="next exercise type"*/}
-                  {/*/>*/}
-                {/*</span> : ''}*/}
-              {/*</h1>*/}
+              <h1 className="title">
+                {this.state.display !== displayType.welcome ?
+                    <span className="debug">
+                  <input
+                      type="button"
+                      onClick={() => this.setState(
+                          {
+                            display: displayType.exercise,
+                            exercise: this._getExercise(),
+                            feedback: '',
+                            counter: this.state.counter + 1,
+                          })}
+                      value="next exercise type"
+                  />
+                </span> : ''}
+              </h1>
               {this.renderDisplay()}
             </div>
           </MuiThemeProvider>