diff --git a/include/js_strings.php b/include/js_strings.php
index a21461a52..b1817f373 100644
--- a/include/js_strings.php
+++ b/include/js_strings.php
@@ -22,6 +22,7 @@ function js_strings() {
 		'$submit'      => t('Submit'),
 		'$linkurl'     => t('Please enter a link URL'),
 		'$leavethispage' => t('Unsaved changes. Are you sure you wish to leave this page?'),
+		'$location'    => t('Location'),
 
 		'$t01' => ((t('timeago.prefixAgo') != 'timeago.prefixAgo') ? t('timeago.prefixAgo') : ''),
 		'$t02' => ((t('timeago.prefixFromNow') != 'timeago.prefixFromNow') ? t('timeago.prefixFromNow') : ''),
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index 00dcc40f8..5e0fc2bce 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -8,3 +8,9 @@
 	width: 100%;
 	padding: 6px 12px;
 }
+
+.event-wrapper {
+	max-width: 700px;
+	height: auto;
+	padding: 10px;
+}
diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl
index 206ee245e..08f0d4fbe 100755
--- a/view/tpl/conv_item.tpl
+++ b/view/tpl/conv_item.tpl
@@ -183,7 +183,7 @@
 											<h4 class="modal-title">{{$response.title}}</h4>
 										</div>
 										<div class="modal-body response-list">
-										<ul>{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
+										<ul class="nav nav-pills nav-stacked">{{foreach $response.list as $liker}}<li role="presentation">{{$liker}}</li>{{/foreach}}</ul>
 										</div>
 										<div class="modal-footer clear">
 											<button type="button" class="btn btn-default" data-dismiss="modal">{{$item.modal_dismiss}}</button>
diff --git a/view/tpl/event_head.tpl b/view/tpl/event_head.tpl
index f587d69a0..6a38057fd 100755
--- a/view/tpl/event_head.tpl
+++ b/view/tpl/event_head.tpl
@@ -71,32 +71,32 @@
 				switch(view.name){
 					case "month":
 					element.find(".fc-title").html(
-						"<img src='{0}' style='height:12px;width:12px;' title='{1}'>&nbsp;<span title='{3}\r\n\r\n{4}'>{2}</span>".format(
+						"<img src='{0}' style='height:12px;width:12px;' title='{1}'>&nbsp;<span title='{3}{4}'>{2}</span>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
-							event.item.description,
-							event.item.location.replace(/(<([^>]+)>)/ig,"")
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
 					));
 					break;
 					case "agendaWeek":
 					element.find(".fc-title").html(
-						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}\r\n\r\n{4}'>{2}</span>".format(
+						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
-							event.item.description,
-							event.item.location.replace(/(<([^>]+)>)/ig,"")
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
 					));
 					break;
 					case "agendaDay":
 					element.find(".fc-title").html(
-						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}\r\n\r\n{4}'>{2}</span>".format(
+						"<img src='{0}' style='height:12px;width:12px;'>&nbsp;{1}: <span title='{3}{4}'>{2}</span>".format(
 							event.item['author']['xchan_photo_s'],
 							event.item['author']['xchan_name'],
 							event.title,
-							event.item.description,
-							event.item.location.replace(/(<([^>]+)>)/ig,"")
+							event.item.description ? event.item.description + "\r\n\r\n" : '',
+							event.item.location ? aStr['location'] + ': ' + event.item.location.replace(/(<([^>]+)>)/ig,"") : ''
 					));
 					break;
 				}
diff --git a/view/tpl/js_strings.tpl b/view/tpl/js_strings.tpl
index 38cf8edbd..4243c2ea5 100755
--- a/view/tpl/js_strings.tpl
+++ b/view/tpl/js_strings.tpl
@@ -22,6 +22,7 @@
 		'submit'      : "{{$submit}}",
 		'linkurl'     : "{{$linkurl}}",
 		'leavethispage' : "{{$leavethispage}}",
+		'location'    : "{{$location}}",
 
 		't01' : "{{$t01}}",
 		't02' : "{{$t02}}",