diff --git a/public/ego_bg.png b/public/ego_bg.png
new file mode 100644
index 0000000..ed8a946
Binary files /dev/null and b/public/ego_bg.png differ
diff --git a/public/favicon.ico b/public/favicon.ico
index a11777c..ac5488a 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/index.html b/public/index.html
index ed0ebaf..89a2b45 100644
--- a/public/index.html
+++ b/public/index.html
@@ -19,7 +19,7 @@
       work correctly both with client-side routing and a non-root public URL.
       Learn how to configure a non-root public URL by running `npm run build`.
     -->
-    <title>React App</title>
+    <title>eGOlogic</title>
   </head>
   <body>
     <noscript>
diff --git a/public/logo_bg.png b/public/logo_bg.png
new file mode 100644
index 0000000..ea1437e
Binary files /dev/null and b/public/logo_bg.png differ
diff --git a/public/manifest.json b/public/manifest.json
index ef19ec2..7b50324 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,15 +1,20 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "short_name": "eGOlogic",
+  "name": "eGOlogic",
   "icons": [
     {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
+      "src": "logo_bg.png",
+      "sizes": "144x144 64x64 32x32 24x24 16x16",
+      "type": "image/png"
+    },
+    {
+      "src": "ego_bg.png",
+      "sizes": "640x640",
+      "type": "image/png"
     }
   ],
-  "start_url": "./index.html",
+  "start_url": "/",
   "display": "standalone",
-  "theme_color": "#000000",
+  "theme_color": "#8dc63f",
   "background_color": "#ffffff"
 }
diff --git a/src/components/DrawerComponent.js b/src/components/DrawerComponent.js
index 7cb3476..8873bc2 100644
--- a/src/components/DrawerComponent.js
+++ b/src/components/DrawerComponent.js
@@ -28,7 +28,11 @@ class DrawerComponent extends Component {
                 <div className={"handle"}></div>
                 <img className={"current-image"} src={this.props.current_activity.info.image} />
                 <span className={"current-address"}>{this.props.current_activity.info.address}</span>
-                <Button type="primary" onClick={this.props.readyRally} className={"current-next-button"}>Next</Button>  
+                {this.props.finishButton() ? (
+                    <Button type="primary" onClick={this.props.readyRally} className={"current-next-button"}>Finish</Button>  
+                ) : (
+                    <Button type="primary" onClick={this.props.readyRally} className={"current-next-button"}>Next</Button>  
+                )}
             </div>
         );
     }
@@ -76,10 +80,14 @@ class DrawerComponent extends Component {
                     <div className={"handle-drawer"}></div>
                     <img className={"current-image-drawer"} src={this.props.current_activity.info.image} />
                     <span className={"current-address-drawer"}>{this.props.current_activity.info.address}</span>
-                    <Alert className={"alert-drawer"} message="Tip:" description={_.sample(GoodActions.data)} type="info" showIcon />
+                    <Alert className={"alert-drawer"} message="Tip:" description={_.sample(GoodActions.data)} type="info" />
                     <Progress className={"progress-drawer"} type="circle" percent={this.props.progress} />
                     <Button type="danger" onClick={this.props.cancelRally} className={"current-next-button-drawer"}>Cancel</Button> 
-                    <Button type="primary" onClick={this.props.readyRally} className={"current-next-button-drawer"}>Next</Button>   
+                    {this.props.finishButton() ? (
+                        <Button type="primary" onClick={this.props.readyRally} className={"current-next-button-drawer"}>Finish</Button>   
+                    ) : (
+                        <Button type="primary" onClick={this.props.readyRally} className={"current-next-button-drawer"}>Next</Button>    
+                    )}
                 </Drawer>
             )}
         </Fragment>
diff --git a/src/components/Feedback.js b/src/components/Feedback.js
index 042a561..64b3014 100644
--- a/src/components/Feedback.js
+++ b/src/components/Feedback.js
@@ -15,6 +15,7 @@ class Feedback extends React.Component {
           visible={visible}
           title="Feedback"
           onOk={this.props.handleOk}
+          className={"modal-feedback"}
           onCancel={this.props.handleCancel}
           footer={[
             <Button key="back" onClick={this.props.handleCancel}>Return</Button>,
@@ -37,7 +38,7 @@ class Feedback extends React.Component {
             <p>How satisfied were you with the furniture in this location?</p>
                 <RadioGroup value={this.props.furnitureChoice} onChange={this.props.onChangeFurniture} defaultValue="a">
                     <RadioButton value="Very Satified">Very Satisfied</RadioButton>
-                    <RadioButton value="Statisfied">Statisfied</RadioButton>
+                    <RadioButton value="Statisfied">Satisfied</RadioButton>
                     <RadioButton value="Unsatisfied">Unsatisfied</RadioButton>
                 </RadioGroup>
             </div>
@@ -46,7 +47,7 @@ class Feedback extends React.Component {
             <p>How satisfied were you with the maintenance of this location?</p>
                 <RadioGroup value={this.props.maintenanceChoice} onChange={this.props.onChangeMaintenance} defaultValue="a">
                     <RadioButton value="Very Satified">Very Satisfied</RadioButton>
-                    <RadioButton value="Statisfied">Statisfied</RadioButton>
+                    <RadioButton value="Statisfied">Satisfied</RadioButton>
                     <RadioButton value="Unsatisfied">Unsatisfied</RadioButton>
                 </RadioGroup>
             </div>
diff --git a/src/containers/DrawerContainer.js b/src/containers/DrawerContainer.js
index a23a2ca..e281779 100644
--- a/src/containers/DrawerContainer.js
+++ b/src/containers/DrawerContainer.js
@@ -85,7 +85,7 @@ class DrawerContainer extends Component {
 
     calculatePercentage = () => {
         const current_activity = this.props.current_activity;
-            if (this.props.activities) {
+        if (this.props.activities) {
             var index = this.props.activities.findIndex(function(activity) {
                 return _.isEqual(activity, current_activity);
             });
@@ -96,6 +96,17 @@ class DrawerContainer extends Component {
         }
     }
 
+    finishButton = () => {
+        const current_activity = this.props.current_activity;
+        if (this.props.current_activity) {
+            var index = this.props.activities.findIndex(function(activity) {
+                return _.isEqual(activity, current_activity);
+            });            
+            return index + 1 === 5;
+        }
+        return false;
+    }
+
     render() {
         return (
             <DrawerComponent
@@ -112,6 +123,7 @@ class DrawerContainer extends Component {
                 progress={this.state.progress}
                 reviewLocation={this.toggleReview}
                 locationReviewed={this.props.locationReviewed}
+                finishButton={this.finishButton}
             />
         );
     }
diff --git a/src/styles/App.css b/src/styles/App.css
index fc65e6d..9533383 100644
--- a/src/styles/App.css
+++ b/src/styles/App.css
@@ -240,9 +240,9 @@ body {
 }
 
 .current-next-button {
-  float: right;
-  margin-top: 7px;
-  margin-right: 2px;
+  position: absolute;
+  bottom: 13px;
+  right: 10px;
   height: 50px;
 }
 
@@ -295,10 +295,11 @@ body {
 .alert-drawer {
   float: left;
   margin: 10px;
-  max-width: 52%;
+  max-width: calc(100% - 180px);
   max-height: 52%;
   word-break: break-word;
 }
+
 .leaderboardDiv {
   text-align: center;
   border-bottom: black 1px solid;
@@ -318,3 +319,7 @@ body {
   color: rgba(0, 0, 0, 0.65);
   text-decoration: none;
 }
+
+.modal-feedback {
+  
+}
