diff --git a/view/css/mod_cal.css b/view/css/mod_cal.css
new file mode 100644
index 000000000..f0b5c0166
--- /dev/null
+++ b/view/css/mod_cal.css
@@ -0,0 +1,51 @@
+/* fix borders */
+
+.fc th:first-child,
+.fc td:first-child {
+    border-left-width: 0px;
+}
+
+.fc th:last-child,
+.fc td:last-child {
+    border-right-width: 0px;
+    border-bottom-width: 0px;
+}
+
+.fc-unthemed th,
+.fc-unthemed td,
+.fc-unthemed thead,
+.fc-unthemed tbody,
+.fc-unthemed .fc-divider,
+.fc-unthemed .fc-row,
+.fc-unthemed .fc-popover {
+	border-color: #ccc !important;
+}
+
+#events-spinner .spinner {
+	margin-top: 9px;
+	margin-bottom: -9px;
+}
+
+.bootstrap-tagsinput {
+	width: 100%;
+	padding: 6px 12px;
+}
+
+.event-wrapper,
+.vevent {
+	max-width: 700px;
+}
+
+.event-owner {
+	padding: 10px;
+}
+
+.event-owner img {
+	margin-right: 5px;
+}
+
+.vevent,
+.event-buttons {
+	padding: 10px;
+}
+
diff --git a/view/css/mod_events.css b/view/css/mod_events.css
index e72464539..f0b5c0166 100644
--- a/view/css/mod_events.css
+++ b/view/css/mod_events.css
@@ -1,7 +1,14 @@
 /* fix borders */
-#events-calendar {
-	margin-left: -1px;
-	margin-bottom: -1px;
+
+.fc th:first-child,
+.fc td:first-child {
+    border-left-width: 0px;
+}
+
+.fc th:last-child,
+.fc td:last-child {
+    border-right-width: 0px;
+    border-bottom-width: 0px;
 }
 
 .fc-unthemed th,
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index 9dcfcdf3e..9a365d8a7 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -1521,10 +1521,8 @@ nav .dropdown-menu {
 .generic-content-wrapper.fullscreen {
 	position: absolute;
 	width: 100%;
-	height: 100%;
 	top: 0px;
 	left: 0px;
-	border: 0px;
 	border-radius: 0px;
 }
 
diff --git a/view/tpl/events-js.tpl b/view/tpl/events-js.tpl
index c29d80347..5c9eb2814 100755
--- a/view/tpl/events-js.tpl
+++ b/view/tpl/events-js.tpl
@@ -1,6 +1,8 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
+			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="icon-resize-small"></i></button>
 			<button class="btn btn-success btn-xs" onclick="openClose('form');">{{$new_event.1}}</button>
 			<div class="btn-group">
 				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl
index bc8a3aa31..abffb2a92 100755
--- a/view/tpl/events_cal-js.tpl
+++ b/view/tpl/events_cal-js.tpl
@@ -2,6 +2,8 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
 		<div class="pull-right">
+			<button id="fullscreen-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen();"><i class="icon-resize-full"></i></button>
+			<button id="inline-btn" type="button" class="btn btn-default btn-xs" onclick="makeFullScreen(false);"><i class="icon-resize-small"></i></button>
 			<div class="btn-group">
 				<button class="btn btn-default btn-xs" onclick="changeView('prev', false);" title="{{$prev}}"><i class="icon-backward"></i></button>
 				<button id="events-spinner" class="btn btn-default btn-xs" onclick="changeView('today', false);" title="{{$today}}"><i class="icon-bullseye"></i></button>