diff --git a/calendar/lib.php b/calendar/lib.php
index 5a76d974384..558e343b6e5 100644
--- a/calendar/lib.php
+++ b/calendar/lib.php
@@ -593,7 +593,7 @@ function calendar_filter_controls($type, $vars = NULL, $course = NULL) {
         $getvars .= '&'.$vars;
     }
 
-    $content = '<table class="cal_controls" style="width: 98%;">';
+    $content = '<table>';
 
     $content .= '<tr>';
     if($SESSION->cal_show_global) {
diff --git a/calendar/view.php b/calendar/view.php
index 5e578f5508f..1d0d3192e9a 100644
--- a/calendar/view.php
+++ b/calendar/view.php
@@ -202,13 +202,10 @@ function calendar_show_day($d, $m, $y, $courses, $groups, $users) {
 
     $events = calendar_get_upcoming($courses, $groups, $users, 1, 100, $starttime);
 
-    // New event button
-    if (empty($USER->id) || isguest()) {
-        $text = get_string('dayview', 'calendar').': '.calendar_course_filter_selector($getvars);
-    } else {
-        $text = '<div style="float: left;">'.get_string('dayview', 'calendar').': '.
-                calendar_course_filter_selector($getvars).'</div><div style="float: right;">';
-        $text.= '<form style="display: inline;" action="'.CALENDAR_URL.'event.php" method="get">';
+    $text = '';
+    if (!isguest() && !empty($USER->id)) {
+        $text.= '<div class="buttons">';
+        $text.= '<form action="'.CALENDAR_URL.'event.php" method="get">';
         $text.= '<input type="hidden" name="action" value="new" />';
         $text.= '<input type="hidden" name="cal_d" value="'.$d.'" />';
         $text.= '<input type="hidden" name="cal_m" value="'.$m.'" />';
@@ -217,7 +214,9 @@ function calendar_show_day($d, $m, $y, $courses, $groups, $users) {
         $text.= '</form></div>';
     }
 
-    echo '<div style="float: left;" class="heading">'.$text.'</div>';
+    $text .= get_string('dayview', 'calendar').': '.calendar_course_filter_selector($getvars);
+
+    echo '<div class="heading">'.$text.'</div>';
 
     echo '<div class="controls">'.calendar_top_controls('day', array('d' => $d, 'm' => $m, 'y' => $y)).'</div>';
 
@@ -227,6 +226,8 @@ function calendar_show_day($d, $m, $y, $courses, $groups, $users) {
 
     } else {
 
+        echo '<div class="eventlist">';
+
         $underway = array();
 
         // First, print details about events that start today
@@ -258,6 +259,9 @@ function calendar_show_day($d, $m, $y, $courses, $groups, $users) {
                 calendar_print_event($event);
             }
         }
+
+        echo '</div>';
+
     }
 }
 
@@ -322,13 +326,9 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) {
     // Extract information: events vs. time
     calendar_events_by_day($events, $m, $y, $eventsbyday, $durationbyday, $typesbyday);
 
-    // New event button
-    if(empty($USER->id) || isguest()) {
-        $text = get_string('detailedmonthview', 'calendar').': '.calendar_course_filter_selector($getvars);
-    }
-    else {
-        $text = '<div style="float: left;">'.get_string('detailedmonthview', 'calendar').': '.calendar_course_filter_selector($getvars).'</div><div style="float: right;">';
-        $text.= '<form style="display: inline;" action="'.CALENDAR_URL.'event.php" method="get">';
+    $text = '';
+    if(!isguest() && !empty($USER->id)) {
+        $text.= '<div class="buttons"><form action="'.CALENDAR_URL.'event.php" method="get">';
         $text.= '<input type="hidden" name="action" value="new" />';
         $text.= '<input type="hidden" name="cal_m" value="'.$m.'" />';
         $text.= '<input type="hidden" name="cal_y" value="'.$y.'" />';
@@ -336,7 +336,9 @@ function calendar_show_month_detailed($m, $y, $courses, $groups, $users) {
         $text.= '</form></div>';
     }
 
-    echo '<div style="float: left;" class="heading">'.$text.'</div>';
+    $text .= get_string('detailedmonthview', 'calendar').': '.calendar_course_filter_selector($getvars);
+
+    echo '<div class="heading">'.$text.'</div>';
 
     echo '<div class="controls">';
     echo calendar_top_controls('month', array('m' => $m, 'y' => $y));
@@ -596,7 +598,7 @@ function calendar_print_event($event) {
                   title="'.get_string('tt_deleteevent', 'calendar').'" /></a>';
         echo '</div>';
     }
-    echo "</td></tr>\n</table>\n";
+    echo '</td></tr></table>';
 
 }
 
diff --git a/theme/standard/styles_layout.css b/theme/standard/styles_layout.css
index 67055053ab5..d2d41a96d2b 100644
--- a/theme/standard/styles_layout.css
+++ b/theme/standard/styles_layout.css
@@ -57,6 +57,10 @@ table {
     border-collapse: collapse;
 }
 
+a img {
+    border:none;
+}
+
 /* header styles */
 #header-home {
     padding:1em 0.5em;
@@ -330,27 +334,6 @@ table.message_search_results td {
     border:2px solid !important;
 }
 
-table.calendarmonth tbody td table,
-table.calendarmonth tbody td div {
-    margin-top:0px;
-    margin-left:0px;
-}
-
-table.calendarmonth tbody td table td, 
-a img {
-    border:none;
-}
-
-.mycalendar .cal_event_table, 
-table.calendarmonth, 
-.mycalendar table.cal_filters {
-    width:100%;
-    margin:0px;
-    padding:2px;
-    border-width:1px;
-    border-style:solid;
-}
-
 .mycalendar hr {
     height:1px;
     margin-top:4px;
@@ -427,7 +410,7 @@ td.cal_event_description {
 }
 
 .sideblockheading .hide-show img.hide-show-image {
-    padding-top:0.25em;
+    margin-top:0.25em;
 }
 
 .sideblockmain {
@@ -558,13 +541,13 @@ CALENDAR STYLES -- PROVISIONALLY PLACED HERE UNTIL FINALIZED
 
 #calendar .maincalendar table.calendarmonth {
     -moz-border-radius: 10px;
-    margin: 1em;
+    margin: 1em 0px;
+    width: 100%;
 }
 
 #calendar .maincalendar table.calendarmonth thead th {
     padding:10px;
     border-bottom:2px solid;
-    vertical-align:center;
 }
 
 #calendar-container #calendar {
@@ -572,7 +555,7 @@ CALENDAR STYLES -- PROVISIONALLY PLACED HERE UNTIL FINALIZED
     border-spacing: 5px;
 }
 
-#calendar-container table {
+#calendar-container .maincalendar .eventlist table, #calendar-container .maincalendar table.calendarmonth {
     border-collapse: separate;
 }
 
@@ -582,8 +565,8 @@ CALENDAR STYLES -- PROVISIONALLY PLACED HERE UNTIL FINALIZED
     font-size:1.2em;
 }
 
-table.calendarmonth tbody td, table.minicalendar tbody td {
-    width:13%;
+table.calendarmonth tbody td, table.minicalendar tbody td, table.minicalendar thead th {
+    width:14%;
     vertical-align:top;
 }
 
@@ -595,20 +578,28 @@ table.calendarmonth tbody td, table.minicalendar tbody td {
 }
 
 #calendar .sidecalendar {
-    width: 180px;
+    width: 25%;
+}
+
+#calendar .maincalendar .heading .buttons {
+    float: right;
 }
 
 .maincalendar .filters table, .sidecalendar .filters table {
     border-spacing: 2px;
-    margin: 2em 0.5em;
     -moz-border-radius:4px;
     background-color: #EEEEEE;
     padding: 2px;
     width: 100%;
 }
 
-.sidecalendar .filters table {
+.sidecalendar .filters {
     font-size: 0.75em;
+    padding: 5px;
+}
+
+.sidecalendar .filters table {
+    
 }
 
 #calendar .maincalendar .heading, #calendar-container .sidecalendar .heading {
@@ -621,14 +612,14 @@ table.calendarmonth tbody td, table.minicalendar tbody td {
 
 table.minicalendar {
     font-size:0.85em;
+    border-collapse:separate;
     -moz-border-radius:10px;
     border-color:#DDDDDD;
-    width:100%;
-    margin:10px;
+    margin:10px auto;
     padding:2px;
     border-width:1px;
     border-style:solid;
-    border-spacing: 1px;
+    border-spacing:1px !important;
 }
 
 table.minicalendar thead th {
@@ -640,8 +631,12 @@ table.minicalendar tbody td {
     text-align: center;
 }
 
+#calendar .maincalendar .eventlist {
+    padding: 10px;
+}
+
 #calendar .eventfull {
-    margin: 2px 10px;
+    margin-bottom:10px;
     width: 100%;
     border-color:#DDDDDD; /* borders */
 }
@@ -653,3 +648,4 @@ table.minicalendar tbody td {
 #calendar .eventfullmessage {
     padding: 5px;
 }
+