diff --git a/src/Containers.react.js b/src/Containers.react.js
index a06a8fd8..59c657cc 100644
--- a/src/Containers.react.js
+++ b/src/Containers.react.js
@@ -78,6 +78,7 @@ var Containers = React.createClass({
     this.transitionTo('new');
   },
   handleAutoUpdateClick: function () {
+    console.log('CLICKED UPDATE');
     ipc.send('command', 'application:quit-install');
   },
   render: function () {
@@ -85,7 +86,16 @@ var Containers = React.createClass({
     if (this.state.sidebarOffset) {
       sidebarHeaderClass += ' sep';
     }
-
+    var updateNotification;
+    var updatePadding;
+    if (this.state.updateAvailable) {
+      updateNotification = (
+        <div className="update-notification"><span className="text">Update Available</span><a className="btn btn-action small" onClick={this.handleAutoUpdateClick}>Update Now</a></div>
+      );
+      updatePadding = (
+        <div className="update-padding"></div>
+      );
+    }
     var container = this.getParams().name ? this.state.containers[this.getParams().name] : {};
     return (
       <div className="containers">
@@ -100,6 +110,8 @@ var Containers = React.createClass({
             </section>
             <section className="sidebar-containers" onScroll={this.handleScroll}>
               <ContainerList containers={this.state.sorted} newContainer={this.state.newContainer} />
+              {updatePadding}
+              {updateNotification}
             </section>
           </div>
           <Router.RouteHandler container={container}/>
diff --git a/src/Main.js b/src/Main.js
index 83f91d64..5cfd4c0e 100644
--- a/src/Main.js
+++ b/src/Main.js
@@ -9,6 +9,8 @@ var router = require('./router');
 var boot2docker = require('./boot2docker');
 var ContainerStore = require('./ContainerStore');
 var SetupStore = require('./SetupStore');
+var MenuTemplate = require('./MenuTemplate');
+var Menu = remote.require('menu');
 var settingsjson;
 
 try {
@@ -32,6 +34,9 @@ bugsnag.releaseStage = process.env.NODE_ENV === 'development' ? 'development' :
 bugsnag.notifyReleaseStages = ['production'];
 bugsnag.appVersion = app.getVersion();
 
+var menu = Menu.buildFromTemplate(MenuTemplate);
+Menu.setApplicationMenu(menu);
+
 router.run(Handler => React.render(<Handler/>, document.body));
 SetupStore.run().then(boot2docker.ip).then(ip => {
   console.log(ip);
diff --git a/src/Menu.js b/src/MenuTemplate.js
similarity index 94%
rename from src/Menu.js
rename to src/MenuTemplate.js
index 22490878..c5a00956 100644
--- a/src/Menu.js
+++ b/src/MenuTemplate.js
@@ -2,13 +2,12 @@ var remote = require('remote');
 var app = remote.require('app');
 var path = require('path');
 var docker = require('./Docker');
-var Menu = remote.require('menu');
 var BrowserWindow = remote.require('browser-window');
 var router = require('./Router');
 var util = require('./Util');
 
 // main.js
-var template = [
+var MenuTemplate = [
 {
   label: 'Kitematic',
   submenu: [
@@ -160,7 +159,5 @@ var template = [
 },
 ];
 
-var menu = Menu.buildFromTemplate(template);
-Menu.setApplicationMenu(menu);
 
-module.exports = menu;
+module.exports = MenuTemplate;
diff --git a/styles/main.less b/styles/main.less
index 55c669b1..3c793c6a 100644
--- a/styles/main.less
+++ b/styles/main.less
@@ -61,6 +61,30 @@ html, body {
   border: 1px solid #ddd;
 }
 
+.update-notification {
+  background-color: white;
+  opacity: 0.9;
+  position: fixed;
+  bottom: 0;
+  width: 259px;
+  padding: 10px;
+  //border-top: 1px solid darken(#FCF8E3, 5%);
+  color: @gray-normal;
+  font-size: 12px;
+  .text {
+    position: relative;
+    top: 3px;
+  }
+  .btn {
+    position: relative;
+    float: right;
+  }
+}
+
+.update-padding {
+  position: relative;
+  height: 40px;
+}
 
 @-webkit-keyframes spin {
   from {