diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 0207bca6b..6e63c2d89 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -31,18 +31,19 @@
   <div id="uploadDialog" style="display: none" class="dialog left">
     <div>
       <h3><var:string label:value="Import Cards"/></h3>
-      <p><var:string label:value="Select a vCard or LDIF file."/></p>
+      <p class="prompt"><var:string label:value="Select a vCard or LDIF file."/></p>
       <form const:href="" name="uploadForm" id="uploadForm" method="post"
         enctype="multipart/form-data"
         onsubmit="return AIM.submit(this, {'onStart' : validateUploadForm, 
         'onComplete' : uploadCompleted})">
-        <p><input type="file" name="contactsFile" id="contactsFile" /></p>
-        <p><a href="#" class="button actionButton" id="uploadSubmit"
+        <p class="prompt"><input type="file" name="contactsFile" id="contactsFile" class="textField" />
+          <a href="#" class="button actionButton" id="uploadSubmit"
             onclick="if($('uploadForm').onsubmit()) $('uploadForm').submit()">
             <span><var:string label:value="Upload" /></span></a>
           <a href="#" class="button" const:id="uploadCancel">
             <span><var:string label:value="Cancel" /></span></a></p>
       </form>
+      <hr/>
     </div>
   </div>
 
@@ -52,6 +53,7 @@
       <p id="uploadResultsContent"><!-- empty --></p>
       <p><a href="#" class="button" const:id="uploadOK">
           <span><var:string label:value="Done" /></span></a></p>
+      <hr/>
     </div>
   </div>
   
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 7b7ccf7b6..bf41c37fe 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -107,27 +107,29 @@
   <div id="uploadDialog" style="display: none" class="dialog left">
     <div>
       <h3><var:string label:value="Import Events"/></h3>
-      <p><var:string label:value="Select an iCalendar file (.ics)."/></p>
+      <p class="prompt"><var:string label:value="Select an iCalendar file (.ics)."/></p>
       <form const:href="" name="uploadForm" id="uploadForm" method="post"
         enctype="multipart/form-data"
         onsubmit="return AIM.submit(this, {'onStart' : validateUploadForm, 
         'onComplete' : uploadCompleted})">
-        <p><input type="file" name="calendarFile" id="calendarFile" /></p>
-        <p><a href="#" class="button actionButton" id="uploadSubmit"
+        <p class="prompt"><input type="file" name="calendarFile" class="textField" id="calendarFile" />
+        <a href="#" class="button actionButton" id="uploadSubmit"
             onclick="if($('uploadForm').onsubmit()) $('uploadForm').submit()">
             <span><var:string label:value="Upload" /></span></a>
-          <a href="#" class="button" const:id="uploadCancel">
-            <span><var:string label:value="Cancel" /></span></a></p>
-      </form>
+        <a href="#" class="button" const:id="uploadCancel">
+            <span><var:string label:value="Cancel" /></span></a>
+      </p></form>
+      <hr/>
     </div>
   </div>
 
   <div id="uploadResults" style="display: none" class="dialog left">
     <div>
       <h3><var:string label:value="Import Events"/></h3>
-      <p id="uploadResultsContent"><!-- empty --></p>
-      <p><a href="#" class="button" const:id="uploadOK">
+      <p><span id="uploadResultsContent"><!-- empty --></span>
+      <a href="#" class="button" const:id="uploadOK">
           <span><var:string label:value="Done" /></span></a></p>
+      <hr/>
     </div>
   </div>
 
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 976b5bc48..12e8af686 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -701,7 +701,7 @@ function onViewEventCallback(http) {
             var divDimensions = div.getDimensions();
             var view;
             var left = cellPosition[0];
-            var top = cellPosition[1];
+            var top = cellPosition[1] - 5;
 
             if (currentView != "monthview") {
                 view = $("daysView");
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index de09abcb2..f0cddc51b 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -596,6 +596,9 @@ DIV.dialog
 DIV.dialog > DIV
 { padding: 5px 10px; }
 
+.dialog.left > DIV {
+  padding-right: 5px;
+}
 .dialog.left > DIV:before {
   content: '';
   display: inline-block;
@@ -618,6 +621,9 @@ DIV.dialog > DIV
   top: 7px;
 }
 
+.dialog.right > DIV {
+  padding-left: 5px;
+}
 .dialog.right > DIV:before {
   content: '';
   display: inline-block;
@@ -658,14 +664,14 @@ DIV.dialog HR
   color: #fff;
   border: 0px; }
 
-DIV.dialog.none H3
+DIV.dialog H3
 { margin: 0; }
 
 DIV.dialog.none P
 { margin: 0px;
   padding: 5px 0px; }
 
-DIV.dialog.none P.prompt
+DIV.dialog P.prompt
 { text-align: right; }
 
 DIV.dialog P.list
@@ -695,20 +701,6 @@ DIV#bgDialogDiv
   background: -webkit-radial-gradient(ellipse cover,rgba(0, 0, 0, .1) 0,rgba(0, 0, 0, .1) 20%,rgba(0, 0, 0, .7) 80%);
   background: -moz-linear-gradient(top, rgba(0, 0, 0, .5),  rgba(0, 0, 0, .1)); }
 
-DIV#uploadDialog,
-DIV#uploadResults
-{ border-width: 1px;
-  width: 260px; }
-
-DIV#uploadDialog DIV,
-DIV#uploadResults DIV
-{ width: 260px; }
-
-DIV#uploadDialog H3,
-DIV#uploadResults H3
-{ margin-top: 0px;
-  font-size: 1.2em; }
-
 /* INPUT styles */
 TEXTAREA
 { vertical-align: top; }
diff --git a/UI/WebServerResources/iefixes.css b/UI/WebServerResources/iefixes.css
index 3c1b94ea4..857577fe1 100644
--- a/UI/WebServerResources/iefixes.css
+++ b/UI/WebServerResources/iefixes.css
@@ -205,10 +205,11 @@ DIV#listEditor TABLE TBODY TR TD:first-child
 A#aboutClose
 { top: 25px;}
 
-DIV#uploadDialog P,
-DIV#uploadResults P
-{ margin: 5px;
-  padding: 0; }
+.dialog h3
+{ font-size: 14px; }
+
+.dialog p
+{ margin: 0px; }
 
 /* UIxPreferences */