diff --git a/src/components/ImageCard.react.js b/src/components/ImageCard.react.js
index 2ccf0a7673..d40a210329 100644
--- a/src/components/ImageCard.react.js
+++ b/src/components/ImageCard.react.js
@@ -57,12 +57,22 @@ var ImageCard = React.createClass({
     containerActions.run(name, repo, this.state.chosenTag);
     this.transitionTo('containerHome', {name});
   },
+  handleMenuOverlayClick: function () {
+    let $menuOverlay = $(this.getDOMNode()).find('.menu-overlay');
+    $menuOverlay.fadeIn(300);
+  },
+  handleCloseMenuOverlay: function () {
+    var $menuOverlay = $(this.getDOMNode()).find('.menu-overlay');
+    $menuOverlay.fadeOut(300);
+  },
   handleTagOverlayClick: function () {
     let $tagOverlay = $(this.getDOMNode()).find('.tag-overlay');
     $tagOverlay.fadeIn(300);
     tagActions.tags(this.props.image.namespace + '/' + this.props.image.name);
   },
   handleCloseTagOverlay: function () {
+    let $menuOverlay = $(this.getDOMNode()).find('.menu-overlay');
+    $menuOverlay.hide();
     var $tagOverlay = $(this.getDOMNode()).find('.tag-overlay');
     $tagOverlay.fadeOut(300);
   },
@@ -82,18 +92,14 @@ var ImageCard = React.createClass({
       name = (
         <div>
           <div className="namespace official">official</div>
-          <OverlayTrigger placement="bottom" overlay={<Tooltip>View on Docker Hub</Tooltip>}>
-            <span className="repo" onClick={this.handleRepoClick}>{this.props.image.name}</span>
-          </OverlayTrigger>
+          <span className="repo">{this.props.image.name}</span>
         </div>
       );
     } else {
       name = (
         <div>
           <div className="namespace">{this.props.image.namespace}</div>
-          <OverlayTrigger placement="bottom" overlay={<Tooltip>View on Docker Hub</Tooltip>}>
-            <span className="repo" onClick={this.handleRepoClick}>{this.props.image.name}</span>
-          </OverlayTrigger>
+          <span className="repo">{this.props.image.name}</span>
         </div>
       );
     }
@@ -114,7 +120,7 @@ var ImageCard = React.createClass({
     }
     var tags;
     if (self.state.loading) {
-      tags = <RetinaImage className="tags-loading" src="loading-white.png"/>;
+      tags = <RetinaImage className="tags-loading" src="loading.png"/>;
     } else if (self.state.tags.length === 0) {
       tags = <span>No Tags</span>;
     } else {
@@ -141,17 +147,25 @@ var ImageCard = React.createClass({
         <RetinaImage src="private.png"/>
       );
     }
-    var tagDisp = (
-      <div className="tags">
-        <span className="key">TAG</span>
-        <span className="text" onClick={self.handleTagOverlayClick.bind(self, this.props.image.name)} data-name={this.props.image.name}>{this.state.chosenTag}</span>
-      </div>
-    );
     return (
       <div className="image-item">
-        <div className="tag-overlay" onClick={self.handleCloseTagOverlay}>
+        <div className="overlay menu-overlay">
+          <div className="menu-item" onClick={this.handleTagOverlayClick.bind(this, this.props.image.name)}>
+            CHOSEN TAG: <span className="selected-tag">{this.state.chosenTag}</span>
+          </div>
+          <div className="menu-item" onClick={this.handleRepoClick}>
+            VIEW ON DOCKER HUB
+          </div>
+          <div className="close-overlay">
+            <a className="btn btn-action circular" onClick={self.handleCloseMenuOverlay}><span className="icon icon-delete"></span></a>
+          </div>
+        </div>
+        <div className="overlay tag-overlay">
           <p>Please select an image tag.</p>
           {tags}
+          <div className="close-overlay" onClick={self.handleCloseTagOverlay}>
+            <a className="btn btn-action circular"><span className="icon icon-delete"></span></a>
+          </div>
         </div>
         <div className="logo" style={logoStyle}>
           <RetinaImage src={imgsrc}/>
@@ -173,7 +187,7 @@ var ImageCard = React.createClass({
               <span className="icon icon-favorite"></span>
               <span className="text">{this.props.image.star_count}</span>
             </div>
-            <div className="more-menu">
+            <div className="more-menu" onClick={self.handleMenuOverlayClick}>
               <span className="icon icon-more"></span>
             </div>
             <div className="action" onClick={self.handleClick}>
diff --git a/styles/left-panel.less b/styles/left-panel.less
index 01ca5e1fec..9568219588 100644
--- a/styles/left-panel.less
+++ b/styles/left-panel.less
@@ -145,9 +145,12 @@
         display: flex;
         flex-direction: row;
         height: 45px;
-        //border-bottom: 1px solid @color-divider;
+        border-top: 1px solid transparent;
+        border-bottom: 1px solid transparent;
         &:hover {
           background-color: @color-box-button;
+          border-top: 1px solid @color-divider;
+          border-bottom: 1px solid @color-divider;
         }
         .info {
           margin-left: 1rem;
diff --git a/styles/new-container.less b/styles/new-container.less
index a36635fd11..966a3f7436 100644
--- a/styles/new-container.less
+++ b/styles/new-container.less
@@ -174,24 +174,48 @@
       background-color: white;
       margin-right: 1rem;
       margin-bottom: 1rem;
-      .tag-overlay {
+      .overlay {
         display: flex;
         flex: 1 0;
-        z-index: 999;
-        background-color: rgba(0,0,0,0.8);
+        background-color: white;
         border-radius: @border-radius;
         min-width: @image-card-width;
         max-width: @image-card-width;
         height: @image-card-height;
         position: absolute;
-        color: white;
-        font-size: 13px;
+        color: @gray-normal;
         display: none;
-        padding: 10px;
+        border: 1px solid @color-divider;
+        
+      }
+      .menu-overlay {
+        z-index: 999;
+        .menu-item {
+          padding: 0.8rem 1rem;
+          border-bottom: 1px solid @color-divider;
+          .box-button();
+          .selected-tag {
+            color: @brand-primary;
+          }        
+        }
+        .close-overlay {
+          position: absolute;
+          bottom: 1rem;
+          right: 1rem;
+        }
+      }
+      .tag-overlay {
+        z-index: 1000;
+        .close-overlay {
+          position: absolute;
+          top: 0.6rem;
+          right: 0.7rem;
+        }
         p {
-          color: white;
-          padding-bottom: 7px;
-          border-bottom: 1px solid rgba(255,255,255,0.2);
+          color: @gray-normal;
+          padding: 0.8rem 1rem;
+          margin-bottom: 0;
+          border-bottom: 1px solid @color-divider;
         }
         .tag-list {
           display: flex;
@@ -199,29 +223,38 @@
           align-items: flex-start;
           align-content: flex-start;
           flex-flow: row wrap;
-          height: 100px;
+          height: 90px;
           overflow: auto;
+          padding: 0.5rem;
           .tag {
+            font-size: 10px;
+            padding: 0.3rem 0.6rem;
             display: inline-block;
             flex: 0 auto;
-            margin-right: 2px;
-            padding: 3px 5px;
+            border-radius: @border-radius;
+            margin-right: 0.3rem;
+            margin-bottom: 0.3rem;
+            border: 1px solid transparent;
             &.active {
-              background-color: rgba(255,255,255,0.2);
-              border-radius: 20px;
+              background-color: @brand-primary;
+              color: white;
+              &:hover {
+                background-color: @brand-primary;
+                color: white;
+                border: 1px solid transparent;
+              }
             }
             &:hover {
-              background-color: rgba(255,255,255,0.2);
-              border-radius: 20px;
+              background-color: @color-box-button;
+              border: 1px solid @color-divider;
             }
           }
         }
         .tags-loading {
           position: relative;
-          left: 42%;
-          top: 20%;
+          left: 45%;
           text-align: center;
-          margin: 14px auto;
+          margin-top: 3rem;
           -webkit-animation-name: spin;
           -webkit-animation-duration: 1.8s;
           -webkit-animation-iteration-count: infinite;
@@ -282,7 +315,7 @@
             font-size: 10px;
             color: @gray-light;
             padding-right: 1rem;
-            height: 46px;
+            height: 44px;
             text-overflow: ellipsis;
             overflow: hidden;
             -webkit-box-orient: vertical;
@@ -295,14 +328,14 @@
           display: flex;
           flex-direaction: column;
           justify-content: flex-end;
-          height: 31px;
+          height: 33px;
           border-top: 1px solid @color-divider;
           .favorites {
             flex: 1 auto;
             font-size: 10px;
             color: @gray-normal;
             border-right: 1px solid @color-divider;
-            padding: 1rem 1.2rem;
+            padding: 1.1rem 1.2rem;
             .icon {
               position: relative;
               font-size: 11px;
@@ -316,20 +349,16 @@
           }
           .tags {
             flex: 1 auto;
-            //height: 12px;
             font-size: 10px;
             color: @gray-darker;
             padding-left: 1rem;
             .key {
               position: relative;
-              //top: -1px;
               font-weight: 400;
               color: @gray-light;
             }
             .text {
               position: relative;
-              //top: -2px;
-              //padding: 3px 5px;
               color: @brand-action;
               &:hover {
                 background-color: @brand-action;
@@ -341,9 +370,8 @@
           .more-menu {
             flex: 0 auto;
             width: 39px;
-            padding: 0.3rem 1rem;
+            padding: 0.4rem 1rem;
             font-size: 20px;
-            //border-right: 1px solid @color-divider;
             .box-button();
           }
           .action {
@@ -351,21 +379,18 @@
             position: relative;
             top: -1px;
             right: -1px;
-            height: 32px;
+            height: 34px;
             .box-button();
-            padding: 0.8rem 1rem;
+            padding: 0.9rem 1rem;
             color: @brand-primary;
             border: 1px solid @brand-primary;
             border-bottom-right-radius: @border-radius;
-            //text-align: right;
-            //position: relative;
-            //float: right;
-            //top: -0.7rem;
-            /*.btn-more {
-              position: absolute;
-              font-size: 20px;
-              right: 7rem;
-            }*/
+            transition: all 140ms;
+            &:hover {
+              background-color: @brand-action;
+              color: white;
+              border: 1px solid darken(@brand-primary, 10%);
+            }
           }
         }
       }
diff --git a/styles/theme.less b/styles/theme.less
index 605c73c23e..bfc7e4645a 100644
--- a/styles/theme.less
+++ b/styles/theme.less
@@ -170,6 +170,17 @@ input[type="text"] {
   text-shadow: none;
   padding: 5px 14px 5px 14px;
   cursor: default;
+  
+  &.circular {
+    border-radius: 100%;
+    width: 25px;
+    height: 25px;
+    padding: 0;
+    padding-top: 4px;
+    .icon {
+      font-size: 10px;
+    }
+  }
 
   &.small {
     font-size: 11px;
diff --git a/styles/variables.less b/styles/variables.less
index 349e645e7c..151ea3490c 100644
--- a/styles/variables.less
+++ b/styles/variables.less
@@ -20,7 +20,7 @@
 @gray-lightest:         #e6edf4;
 
 @color-divider:         @gray-lightest;
-@color-box-button:      lighten(@gray-lightest, 6%);
+@color-box-button:      lighten(@gray-lightest, 5%);
 @color-background:      lighten(@gray-lightest, 5.5%);
 
 @font-regular:          "Helvetica Neue", Helvetica, Arial, "Lucida Grande", sans-serif;