diff --git a/frontend-js/src/main/css/global.css b/frontend-js/src/main/css/global.css
index 506b94d1cc92ac6137fd4d289f49fd9525e17d30..187ebbd45c2a5e67b2483076df4c0664439b6e8e 100644
--- a/frontend-js/src/main/css/global.css
+++ b/frontend-js/src/main/css/global.css
@@ -468,4 +468,9 @@ table.minerva-window-drug-table, table.minerva-window-drug-table th,
 	margin-top: 12px;
 	display: inline;
 	float: left;
+}
+
+.minerva-overlay-dialog div[style*="display: table-cell"] {
+	padding: 2px;
+	vertical-align: top;
 }
\ No newline at end of file
diff --git a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
index 6880c24711602bbb0f30ffdfa199fcd485205cb8..7176d633c96585781fc0de9eaab476c33b5c3472 100644
--- a/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
+++ b/frontend-js/src/main/js/gui/leftPanel/OverlayPanel.js
@@ -215,13 +215,13 @@ OverlayPanel.prototype.openEditOverlayDialog = function(overlay) {
   var self = this;
   var guiUtils = self.getGuiUtils();
   var content = document.createElement("fieldset");
-  content.appendChild(guiUtils.createLabel("Name"));
   var nameInput = guiUtils.createInputText(overlay.getName());
-  content.appendChild(nameInput);
+  var row = guiUtils.createTableRow([ guiUtils.createLabel("Name: "), nameInput ]);
+  content.appendChild(row);
 
-  content.appendChild(guiUtils.createLabel("Description"));
   var descriptionInput = guiUtils.createTextArea(overlay.getDescription());
-  content.appendChild(descriptionInput);
+  row = guiUtils.createTableRow([ guiUtils.createLabel("Description: "), descriptionInput ]);
+  content.appendChild(row);
 
   var buttons = [ {
     text : "SAVE",
@@ -260,6 +260,8 @@ OverlayPanel.prototype.openEditOverlayDialog = function(overlay) {
   self.openDialog(content, {
     id : overlay.getId(),
     buttons : buttons,
+    title : "Data overlay: " + overlay.getName(),
+    className : "minerva-overlay-dialog",
   });
 };