diff --git a/calendar/js/app.js b/calendar/js/app.js
index 2540ed7fc2..d28032ca42 100644
--- a/calendar/js/app.js
+++ b/calendar/js/app.js
@@ -2559,7 +2559,7 @@ app.classes.calendar = AppJS.extend(
 		 */
 		_owner: function(state) {
 			var owner = '';
-			if(state.owner.length && state.owner.length == 1)
+			if(state.owner.length && state.owner.length == 1 && app.calendar.sidebox_et2)
 			{
 				var own = app.calendar.sidebox_et2.getWidgetById('owner').getDOMNode();
 				if(own.selectedIndex >= 0)
diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js
index e3e22619a7..7a9952d46b 100644
--- a/calendar/js/et2_widget_event.js
+++ b/calendar/js/et2_widget_event.js
@@ -291,7 +291,7 @@ var et2_calendar_event = et2_valueWidget.extend([et2_IDetachedDOM],
 
 	_tooltip: function() {
 		
-		var border = this.div.css('border-color');
+		var border = this.div.css('borderTopColor');
 		var bg_color = this.div.css('background-color');
 		var header_color = this.title.css('color');
 
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index f370c263e0..bac9698db0 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -404,6 +404,9 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 	max-height: 400px;
 	overflow: auto;
 }
+.calendar_calEventTooltip .calendar_calEventBodySmall {
+	padding-bottom: 1em;
+}
 
 .calendar_calAddEvent{
 	width: 100%;
@@ -472,7 +475,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calEventBodySmall{
 	font-size: 95%;
 }
-
 .calendar_calEventLabel{
 	font-weight: bold;
 	font-size: 90%;
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index a401849a50..038825fd80 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -917,26 +917,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calEventHeaderSmall .calendar_calEventIcons img {
   height: 13px;
 }
-/* body of the event
- */
-.calendar_calEventBody,
-.calendar_calEventBodySmall {
-  padding: 0px 3px 0px;
-  left: 2px;
-  right: 2px;
-  height: 99%;
-}
-.calendar_calEventBodySmall {
-  font-size: 95%;
-}
-.calendar_calEventLabel {
-  font-weight: bold;
-  font-size: 90%;
-}
-.calendar_calEventTitle {
-  font-weight: bold;
-  font-size: 110%;
-}
 /* table of the dayView containing 2 cols: 1) day-view, 2) todos
 */
 .calendar_calDayView {
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index f41b63846b..bbb15abf60 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -1039,29 +1039,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
     height: 13px;
 }
 
-/* body of the event
- */
-.calendar_calEventBody,.calendar_calEventBodySmall{
-    padding: 0px 3px 0px;
-    left: 2px;
-    right: 2px;
-    height: 99%;
-}
-
-.calendar_calEventBodySmall{
-    font-size: 95%;
-}
-
-.calendar_calEventLabel{
-    font-weight: bold;
-    font-size: 90%;
-}
-
-.calendar_calEventTitle{
-    font-weight: bold;
-    font-size: 110%;
-}
-
 /* table of the dayView containing 2 cols: 1) day-view, 2) todos
 */
 .calendar_calDayView{
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index e7c65694c2..5a4907c0a7 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -795,6 +795,7 @@ ul.et2_link_string {
   background-color: #FDF9DB;
   max-width: 300px;
   color: black;
+  z-index: 999;
 }
 /**
  * Tabs widget