diff --git a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
index e8bc4a96..94fe0f10 100644
--- a/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
+++ b/vendor/built_in_modules/calendar/app/assets/stylesheets/calendar.css
@@ -251,6 +251,87 @@
 
 
 
+/* agenda view */
+#calendar_agenda {
+	border-bottom: solid 1px #ddd;
+}
+#calendar_agenda .table {
+	margin-bottom: 0;
+}
+.event_time {
+	font-family: Tahoma, sans-serif;
+}
+
+/* day view */
+#calendar_day .header {
+	margin-bottom: 10px;
+}
+#calendar_day .header th {
+	text-align: center;
+}
+#calendar_day td {
+	border: 0;
+}
+#calendar_day .event {
+	margin-bottom: 2px;
+}
+#calendar_day .all_day_event {
+	background: #eee;
+	border: solid 1px #ddd
+}
+#calendar_day .event_list .table {
+	border-top: solid 1px #ddd;
+}
+#calendar_day .event_list td {
+	padding: 0;
+}
+#calendar_day .event_list .day_time {
+	height: 30px;
+	border-bottom: solid 1px #ddd;
+	border-left: solid 1px #ddd;
+	text-align: right;
+	padding: 4px;
+}
+#calendar_day .event_list .cell {
+	height: 38px;
+	border: solid 1px #ddd;
+	border-top: 0;
+}
+#calendar_day .event_list .divide {
+	height: 18px;
+	margin-bottom: 18px;
+	border-bottom: solid 1px #eee;
+}
+#calendar_day .event_holder {
+	width: 100%;
+	height: 100%;
+	position: absolute;
+	top: 0;
+}
+#calendar_day .event_holder .event {
+	padding: 0px;
+	position: absolute;
+	width: 100%;
+}
+#calendar_day .event_holder .event.half {
+
+}
+#calendar_day .event_holder .event.over {
+	outline: solid 1px #fff;
+}
+#calendar_day .event dl, #calendar_day .event dt, #calendar_day .event dd {
+	margin: 0;
+	padding: 0;
+}
+#calendar_day .event dl {
+	padding: 3px;
+}
+#calendar_day .event dt {
+	font-size: 11px;
+	font-weight: normal;
+	line-height: 12px;
+}
+
 
 /* calendars(category) */
 .calendars_color_tag {
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb
index cdbc1c47..047be06f 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/day_view.html.erb
@@ -117,37 +117,35 @@
 						<div class="divide"></div>
 					</div>
 					<div class="event_holder">
-						<div class="inner">
-							<div class="event" style="background-color: #66cc00; top: 0;">
-								<dl>
-									<dt>10:30am - 11:00am</dt>
-									<dd>template</dd>
-								</dl>
-							</div>
-							<div class="event" style="background-color: #00aacc; top: 39px;">
-								<dl>
-									<dt>10:30am - 11:00am</dt>
-									<dd>template</dd>
-								</dl>
-							</div>
-							<div class="event half" style="background-color: #ccffee; top: 117px;">
-								<dl>
-									<dt>10:30am - template</dt>
-									<dd></dd>
-								</dl>
-							</div>
-							<div class="event" style="background-color: #00ffee; top: 195px; width: 85%;">
-								<dl>
-									<dt>10:30am - 11:00am</dt>
-									<dd>template</dd>
-								</dl>
-							</div>
-							<div class="event over" style="background-color: #00ccee; top: 214px; left: 50%; width: 50%;">
-								<dl>
-									<dt>10:30am - 11:00am</dt>
-									<dd>template</dd>
-								</dl>
-							</div>
+						<div class="event" style="background-color: #66cc00; top: 0;">
+							<dl>
+								<dt>10:30am - 11:00am</dt>
+								<dd>template</dd>
+							</dl>
+						</div>
+						<div class="event" style="background-color: #00aacc; top: 39px;">
+							<dl>
+								<dt>10:30am - 11:00am</dt>
+								<dd>template</dd>
+							</dl>
+						</div>
+						<div class="event half" style="background-color: #ccffee; top: 117px;">
+							<dl>
+								<dt>10:30am - template</dt>
+								<dd></dd>
+							</dl>
+						</div>
+						<div class="event" style="background-color: #00ffee; top: 195px; width: 85%;">
+							<dl>
+								<dt>10:30am - 11:00am</dt>
+								<dd>template</dd>
+							</dl>
+						</div>
+						<div class="event over" style="background-color: #00ffee; top: 214px; left: 50%; width: 50%;">
+							<dl>
+								<dt>10:30am - 11:00am</dt>
+								<dd>template</dd>
+							</dl>
 						</div>
 					</div>
 				</td>
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
index 75758aa7..2dc89700 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/index.html.erb
@@ -28,7 +28,7 @@
 </div>
 <div id="orbit_calendar" class="month_view">
 	<div class="row-fluid">
-		<div class="span3">
+		<div class="span2">
 			<div class="btn-toolbar" style="margin:0;">
 				<div class="btn-group">
 					<button class="btn">Today</button>
@@ -39,10 +39,10 @@
 				</div>
 			</div>
 		</div>
-		<div class="span5">
+		<div class="span7">
 			<h4 class="current_day_title">Semptember 2012</h4>
 		</div>
-		<div class="span4">
+		<div class="span3">
 			<div class="btn-group calendar_mode" data-toggle="buttons-radio">
 				<button class="btn mode_switch">day</button>
 				<button class="btn mode_switch">week</button>
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb
index adf5f12e..f900fdbb 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/month_view.html.erb
@@ -87,7 +87,11 @@
 			</tr>
 			<tr>
 				<td colspan="3"></td>
+<<<<<<< HEAD
 				<td><div class="event single" style="color: #ffcc00;">7pm - 9pm test event</div></td>
+=======
+				<td><div class="event" style="color: #ffcc00;">7pm - 9pm test event</div></td>
+>>>>>>> calendar update
 				<td colspan="3"></td>
 			</tr>
 		</table>
diff --git a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb
index c6136bdd..a2d6dfbe 100644
--- a/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb
+++ b/vendor/built_in_modules/calendar/app/views/panel/calendar/back_end/cals/week_view.html.erb
@@ -195,4 +195,4 @@
 			</tr>
 		</table>
 	</div>
-</div>
\ No newline at end of file
+</div>