diff --git a/panels_ipe/css/panels_ipe.css b/panels_ipe/css/panels_ipe.css
index 30b9ce6..606f813 100644
--- a/panels_ipe/css/panels_ipe.css
+++ b/panels_ipe/css/panels_ipe.css
@@ -114,6 +114,9 @@
 #panels-ipe-tray a,
 #panels-ipe-tray p {
   font-family: Arial, Helvetica, sans-serif;
+}
+
+#panels-ipe-tray p {
   margin: 0;
 }
 
@@ -243,12 +246,6 @@ html[dir="rtl"] .ipe-tab:last-child {
   justify-content: center;
 }
 
-.ipe-current-layout {
-  vertical-align: top;
-  padding-right: 10px;
-  white-space: nowrap;
-}
-
 /* Remove <ul> list styling and make list scrollable. */
 .ipe-layouts {
   vertical-align: top;
@@ -265,34 +262,43 @@ html[dir="rtl"] .ipe-tab:last-child {
   display: inline-block;
   margin-right: 10px;
   vertical-align: top;
+  border: 1px solid #d4d4d4;
+  min-width: 150px;
+  transition: .2s;
 }
 
-/* Reset anchor tag styles. */
-.ipe-layout,
 .ipe-layout:hover {
-  border: none;
+  background: #f1f1f1;
 }
 
 /* Show the layout's label on hover. */
 .ipe-layout-label {
   display: block;
-  position: absolute;
-  top: 5px;
-  font-weight: bold;
-  color: white;
-  text-shadow: 0 0 5px black, 1px 1px black;
-  opacity: 0;
+  color: black;
+  line-height: 14px;
+  font-size: 14px;
+  padding: 10px;
+  border-top: 1px solid #d4d4d4;
   transition: .2s;
 }
 
-.ipe-layout:hover .ipe-layout-label {
-  opacity: 100;
+/* Flag the current layout if a user is viewing it inside its category. */
+.ipe-current-layout-label {
+  position: absolute;
+  top: 0;
+  left: 0;
+  padding: 5px;
+  background: #437d21;
+  color: white;
+  border-bottom-right-radius: 5px;
+  line-height: 12px;
+  font-size: 12px;
 }
 
-/* Make sure image icons aren't t0o big */
+/* Make sure image icons aren't too wide. */
 .ipe-layout-image {
   width: 75px;
-  height: 112px;
+  margin: 10px 0 10px 0;
 }
 
 /* Style the block/region headers. */
@@ -361,8 +367,6 @@ div.ipe-actions-block {
   font-size: 14px;
 }
 
-
-
 /* Fix contextual links hovering over action links. */
 
 [data-block-id] [data-contextual-id].contextual {
diff --git a/panels_ipe/js/views/LayoutPicker.js b/panels_ipe/js/views/LayoutPicker.js
index 1216413..f500dcb 100644
--- a/panels_ipe/js/views/LayoutPicker.js
+++ b/panels_ipe/js/views/LayoutPicker.js
@@ -94,7 +94,7 @@
       this.renderCategories();
 
       // Flag the current layout.
-      var current_layout_text = '<p>' + Drupal.t('Current Layout') + '</p>';
+      var current_layout_text = '<span class="ipe-current-layout-label">' + Drupal.t('Current') + '</span>';
       this.$('[data-layout-id="' + current_layout + '"]').append(current_layout_text);
 
       // Prepend the current layout as its own category.