diff --git a/cal/views.py b/cal/views.py
index a7abc43..4f3b611 100644
--- a/cal/views.py
+++ b/cal/views.py
@@ -35,28 +35,28 @@ def formatday(self, day, weekday):
             if date.today() == date(self.year, self.month, day):
                 cssclass += ' today'
                 cssclass += ' filled'
-            body = ['<ul>']
+            body = ['<ul class="daily-events">']
             for event in self.events.exclude(startDate__gt=d1).exclude(endDate__lt=d, endDate__isnull=False).exclude(endDate__isnull=True, startDate__lt=d):
-                body.append('<li>')
+                body.append('<li class="event">')
                 body.append('<a href="/wiki/%s">' % event.wikiPage)
-                body.append(event.startDate.strftime('%H:%M') + ' ' + esc(event.name))
+                body.append('<span class="event-time">' + event.startDate.strftime('%H:%M') + '</span> ' + esc(event.name))
                 body.append('</a>')
                 if self.admin:
                     body.append(u'<a href="%s" class="edit">/e</a>' % event.get_absolute_url())
                 body.append('</li>')
             body.append('</ul>')
-            return self.day_cell(cssclass, '%d %s' % (day, (u''.join(body)).encode('utf-8')))
+            return self.day_cell(cssclass, '<div class="day-nr">%d</div> %s' % (day, (u''.join(body)).encode('utf-8')) )
             return self.day_cell(cssclass, day)
         return self.day_cell('noday', '&nbsp;')
 
-    def formatmonth(self, year, month, withyear=False):
+    def formatmonth(self, year, month):
         self.year, self.month = year, month
 
         d = date(int(year), int(month), 1)
         prev = d - relativedelta.relativedelta(months=1)
         next = d + relativedelta.relativedelta(months=1)
-        head = u'<a href="/calendar/%04d/%02d/">&lt;</a> <a href="/calendar/%04d/%02d/">&gt;</a>' % (prev.year, prev.month, next.year, next.month)
-        return head.encode('utf-8') + super(EventCalendar, self).formatmonth(year, month, withyear)
+        head = u'<a href="/calendar/%04d/%02d/" class="btn">&lsaquo;</a> <a href="/calendar/%04d/%02d/" class="btn">&rsaquo;</a>' % (prev.year, prev.month, next.year, next.month)
+        return head.encode('utf-8') + super(EventCalendar, self).formatmonth(year, month)
 
     def group_by_day(self, events):
         field = lambda event: event.startDate.day
diff --git a/static/javascripts/ml-ajaxtools.js b/static/javascripts/ml-ajaxtools.js
index 75ec019..2aca382 100644
--- a/static/javascripts/ml-ajaxtools.js
+++ b/static/javascripts/ml-ajaxtools.js
@@ -70,14 +70,14 @@ function delete_entry(type, id) {
 function toggleView(type, id, onoff) {
     view = $(type + '-view-' + id);
     edit = $(type + '-edit-' + id);
-    
+
     if (onoff) {
         set_visible(edit);
         set_invisible(view);
     } else {
         set_visible(view);
-        set_invisible(edit);    
-    }    
+        set_invisible(edit);
+    }
 }
 
 function set_visible(obj) {
@@ -98,10 +98,10 @@ function do_on_load()
 
 function enter_pressed(e){
     var keycode;
-    if (window.event) keycode = window.event.keyCode; 
-    else if (e) keycode = e.which; 
-    else return false; 
-    return (keycode == 13); 
+    if (window.event) keycode = window.event.keyCode;
+    else if (e) keycode = e.which;
+    else return false;
+    return (keycode == 13);
 }
 
 addEvent(window, 'load', do_on_load);
@@ -112,22 +112,33 @@ function submit_event(id) {
     var cnt = $('calendar-edit-'+id);
 
     new Ajax.Request(frm.readAttribute('action'), {
-                                                    parameters: frm.serialize(true),
-                                                    onSuccess: function(r) {
-                                                                            new Ajax.Updater('calendar-content', calendarUpdateURL, {
-                                                                              method: 'get'})
-                                                                           },
-                                                    onFailure: function(r) {
-                                                                            cnt.innerHTML = r.responseText;
-                                                                            DateTimeShortcuts.init.defer(1);
-                                                                           }
-                                                  })
+      parameters: frm.serialize(true),
+      onSuccess: function(r) {
+
+        var notification = document.createElement('div');
+        notification.className = 'notification success';
+        notification.innerHTML = '<h3>Event created or updated!</h3> ' + r.responseText;
+        document.getElementById('calendar-update').parentNode.appendChild(notification);
+
+        new Ajax.Updater('calendar-update', calendarUpdateURL, {
+          method: 'get'
+        });
+
+//        new Notification('success', 'Event created/updated!', r.responseText).show();
+
+
+      },
+      onFailure: function(r) {
+        cnt.innerHTML = r.responseText;
+        DateTimeShortcuts.init.defer(1);
+      }
+    })
 }
 
 
 function update_metasense() {
     /*new Ajax.Request('http://metalab.at/metasense/status.html', {asynchronous:true, onFailure:function(){}, onException:function(){}, onSuccess:function(transport){ */
-    new Ajax.Request('/metasense/status.html', {asynchronous:true, onFailure:function(){}, onException:function(){}, onSuccess:function(transport){ 
+    new Ajax.Request('/metasense/status.html', {asynchronous:true, onFailure:function(){}, onException:function(){}, onSuccess:function(transport){
         oopen = $('presence_open');
         oclosed = $('presence_closed');
         odefunct = $('presence_defunct');
@@ -137,7 +148,7 @@ function update_metasense() {
             set_invisible(odefunct);
           } else if( transport.responseText.match("niemand")){
             set_visible(oclosed);
-            set_invisible(oopen);            
+            set_invisible(oopen);
             set_invisible(odefunct);
         } else {
             set_invisible(oopen);
diff --git a/static/stylesheets/cal.css b/static/stylesheets/cal.css
index 9a5833f..6a04b08 100644
--- a/static/stylesheets/cal.css
+++ b/static/stylesheets/cal.css
@@ -5,16 +5,15 @@
 
 #calendar-content ul {
 	border: 1px solid #ddd;
+	box-sizing: border-box;
 }
 
 #calendar-content li {
 	display: block;
-/* width:100%;  broken on IE7 :(*/
-	width: 329px;
 }
 
-#calendar-content div {
-	padding: 1px 0 0 1px;
+#calendar-content li {
+  padding: 1px 1px 0 1px;
 }
 
 #calendar-content li p {
@@ -27,7 +26,7 @@
 }
 */
 #calendar-content li .event {
-	background: #C8D8FF;	
+	background: #C8D8FF;
 }
 
 #calendar-content li .past_event {
@@ -66,6 +65,7 @@
 
 table.month {
     border-collapse: collapse;
+		width: 100%;
 }
 
 table.month th {
@@ -78,7 +78,7 @@ table.month th {
 table.month th.month {
     background-color: inherit;
     font-size: 20pt;
-    padding: 4px;
+    padding: 4px 0;
     color: #aaa;
     text-align: right;
 }
@@ -87,8 +87,9 @@ table.month td {
     border: 1px solid white;
     background-color: #ddd;
     width: 14%;
-    height: 110px;
+    height: 5em;
     color: #999;
+		hyphens: auto;
 }
 
 table.month td:nth-last-child(-n+2) {
@@ -115,62 +116,53 @@ table.month td li:last-child {
 }
 
 table.month td.today {
-    background-color: #c0c0ff; 
+    background-color: #c0c0ff;
     color:white;
     font-weight:bold;
 }
 
+table.month .day-nr {
+		text-align: right;
+		line-height: 1em;
+}
+table.month .event-time {
+	  font-weight: bold;
+}
 
+#calendar-year-list {
+	text-align: right;
+}
 
-@media screen and (max-width: 800px)  {
+.edit-form {
+	max-width: 20em;
+	background-color: #f6f6f6;
+	padding: 1em;
+}
 
-	table.month th.month {
-		text-align: left;
-		margin: .2em 0;
-	}
 
 
-	.month .noday, /* hide nodays */
-	.month tr:nth-child(2) /* hide weekdays*/
-	{
-		position: absolute;
-		top: -9999px;
-		left: -9999px;
-	}
+@media screen and (max-width: 800px)  {
 
-	table.month td {
-		width:auto;
+	table.month {
+	    margin: 0 -2%;
+			width: 104%;
 	}
 
-
-	/* reset table stuff */
-	table.month, 
-	.month tbody, 
-	.month th, 
-	.month td, 
-	.month tr {
-		display: block;
+	table.month .event-time {
+		  display: block;
+		  font-size: .9em;
 	}
-
-	.month td {
-		position: relative;
-		padding-left: 2em;
+	table.month .event {
+			font-size: .9em;
+		  word-wrap: break-word;
+			hyphens: auto;
+			line-height: 1em;
+			word-break: break-all;
+			overflow-wrap: break-word;
+			text-overflow: ellipsis;
+			overflow: hidden;
+			width: 100%;
+			word-wrap: normal;
 	}
 
-	/* weekdays via css */
-	.month td:before {
-		position: absolute;
-		top: 3px;
-		left: 3px;
-		padding-right: 10px;
-		white-space: nowrap;
-	}
-	.month td:nth-of-type(1):before { content: "Mo"; }
-	.month td:nth-of-type(2):before { content: "Di"; }
-	.month td:nth-of-type(3):before { content: "Mi"; }
-	.month td:nth-of-type(4):before { content: "Do"; }
-	.month td:nth-of-type(5):before { content: "Fr"; }
-	.month td:nth-of-type(6):before { content: "Sa"; }
-	.month td:nth-of-type(7):before { content: "So"; }
 }
-
diff --git a/static/stylesheets/global.css b/static/stylesheets/global.css
index eb2310e..e7abbc8 100755
--- a/static/stylesheets/global.css
+++ b/static/stylesheets/global.css
@@ -1,56 +1,92 @@
-/* -------------------------
-	    Metalab CSS
-	    
-	    Version 1.0
- ---------------------------*/
-
-html { height: 100%;}
-
-body { 
-	font: 76% "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif; 
+/* -------------------------
+	    Metalab CSS
+
+	    Version 1.0
+ ---------------------------*/
+
+html { height: 100%;}
+
+body {
+	font: 76% "Helvetica Neue", Arial, Helvetica, Geneva, sans-serif;
 	color: #444;
-	line-height: 1.3em;
-	}
-
-/* text formating */
-h1, h2, h3 { line-height: 1em;}
-
-h1 { font-size: 1.5em; color: #4F5C7F; margin:  0 0 1em 0;}
-
-h2 { font-size: 1.1em; color: #4F5C7F; margin: 1.5em 0 1em 0;}
-
-h3 { font-size: 1em; font-weight: bold; color: #444; margin: 1.5em 0 1em 0;}
-
-p { margin: 1em 0;}
-
-a {	text-decoration: none; color: #5D5EA2;}
-
-a:hover { color: #ffffff; background: #8c9ce9;}
-
-img { border: none;}
-
-strong { font-weight: bold;}
-
-small { font-size: 0.9em;}
-
-/* global classes */
-.ir { text-indent: -100em; overflow: hidden;} /* image replacement - hides text from browsers with css on */
-
-/* form classes */
-.tf { border: 1px solid #ccc}
-
-
-/* table styles */
-td { background: #FFF; padding: 3px 5px; vertical-align: top; }
-
-.thumb_with_text {margin-top:3px;}
-
-#table_user_details td{padding:3px;text-valign:top;}
-
-#table_user_list td {padding:10px 2px;text-valign:top;}
-
-tr.even td {background-color:#EEEEEE;}
-tr.odd td {background-color:white;}
-
+	line-height: 1.3em;
+	}
+
+/* text formating */
+h1, h2, h3 { line-height: 1em;}
+
+h1 { font-size: 1.5em; color: #4F5C7F; margin:  0 0 1em 0;}
+
+h2 { font-size: 1.1em; color: #4F5C7F; margin: 1.5em 0 1em 0;}
+
+h3 { font-size: 1em; font-weight: bold; color: #444; margin: 1.5em 0 1em 0;}
+
+p { margin: 1em 0;}
+
+a {	text-decoration: none; color: #5D5EA2;}
+
+a:hover { color: #ffffff; background: #8c9ce9;}
+
+img { border: none;}
+
+strong { font-weight: bold;}
+
+small { font-size: 0.9em;}
+
+/* global classes */
+.ir { text-indent: -100em; overflow: hidden;} /* image replacement - hides text from browsers with css on */
+
+/* form classes */
+.tf { border: 1px solid #ccc}
+
+
+/* table styles */
+td { background: #FFF; padding: 3px 5px; vertical-align: top; }
+
+.thumb_with_text {margin-top:3px;}
+
+#table_user_details td{padding:3px;text-valign:top;}
+
+#table_user_list td {padding:10px 2px;text-valign:top;}
+
+tr.even td {background-color:#eee;}
+tr.odd td {background-color:#fff;}
+
 .flattrbtn { display: inline-block; vertical-align: middle; }
-
+
+.btn {
+    background-color: #4F5C7F;
+    color: #fff;
+    font-weight: bold;
+    display: inline-block;
+		font-size: 1.2em;
+    line-height: 1.6em;
+    text-align: center;
+    padding: .3em .6em;
+		min-width: 1.2em;
+}
+
+/* list items inline */
+.inline-list {
+	display: block;
+}
+.inline-list > li {
+	display: inline;
+}
+
+/*  notifications */
+.notification {
+	padding: .5em .5em 0;
+	margin-bottom: .5em;
+	border-radius: 5px;
+	background: #fff;
+	border: #aaa 3px solid;
+}
+.notification h3 {
+	font-size: 1.2em;
+	margin: 0;
+}
+.success { border-color: #00bf00; }
+.warning { border-color: #dada10; }
+.error { border-color: #e31515; }
+.info { border-color: #62a7f5; }
diff --git a/static/stylesheets/layout.css b/static/stylesheets/layout.css
index ee65163..3bfcfb7 100644
--- a/static/stylesheets/layout.css
+++ b/static/stylesheets/layout.css
@@ -1,6 +1,6 @@
 /* -------------------------
 	    Metalab CSS
-	    
+
 	    Version 1.0
  ---------------------------*/
 
@@ -10,7 +10,7 @@
 	background: #fff;
 	border: none;
 }
- 
+
 #page {
 	 width: 900px;
 	 margin: 0 auto 2em auto;
@@ -62,7 +62,7 @@
 #login {
 	float: right;
 	margin: 0.7em 3em 0 0;
-	
+
 }
 
 #presence_closed{
@@ -93,7 +93,7 @@
 }
 
 
-#soup_credits { 
+#soup_credits {
  font-size:0.8em;
  text-align:right;
  margin-top:-255px;
@@ -114,7 +114,7 @@ display:none;
 }
 
 
-#soup_iframe_wrapper { 
+#soup_iframe_wrapper {
  position:relative;
  top:-255px;
 
@@ -261,6 +261,7 @@ display:none;
 }
 
 
+
 /* small screen stuff */
 @media screen and (max-width: 920px) {
 
@@ -270,7 +271,7 @@ display:none;
 	}
 
 
-	#main #column_1, 
+	#main #column_1,
 	#main #column_2,
 	#soup_iframe,
 	#calendar-content li,
@@ -281,7 +282,7 @@ display:none;
 		display: block;
 		float: none;
 	}
-	
+
 	#soup,
 	#project_list {
 		width: 49%;
@@ -298,11 +299,11 @@ display:none;
 	#openlab {
 		padding: 0;
 	}
-	
+
 	#soup_credits {
 		text-align: left;
 	}
-	
+
 }
 
 
@@ -311,8 +312,8 @@ display:none;
 
 	#soup,
 	#calendar,
-	#project_list, 
-	#issue_tracker, 
+	#project_list,
+	#issue_tracker,
 	#recent_changes
 	{
 		width: 100% !important;
@@ -365,10 +366,10 @@ display:none;
 		margin: 0;
 		padding: 0.7em 1em;
 	}
-	
+
 	/* move login link next to menu button*/
 	#login {
 	    margin: 1.2em 5em 0 0;
 	}
 
-}
\ No newline at end of file
+}
diff --git a/templates/cal/event_archive.html b/templates/cal/event_archive.html
index 7621ae0..55ec94d 100644
--- a/templates/cal/event_archive.html
+++ b/templates/cal/event_archive.html
@@ -26,22 +26,28 @@ <h1 id="site-name">{{HOS_NAME}} Calendar</h1>
    {{ description.description }}</p>
 {% endif %}
 
-<ul>{% for date in date_list %}
-  <li style="display:inline;"><a href="{% url "cal_archive_year" year=date.year %}">{{date.year}}</a></li>
-{% endfor %}</ul>
+<ul id="calendar-year-list" class="inline-list">
+{% for date in date_list %}
+  <li><a href="{% url "cal_archive_year" year=date.year %}">{{date.year}}</a></li>
+{% endfor %}
+</ul>
 
     {% if type %}
       {% with "True" as edit_disabled %}
         {% with "True" as all_events %}   {# variable for switching more link ind calendar.inc #}
+    <div id="calendar-update">
 	  {% include "cal/calendar.inc" %}
+    </div>
         {% endwith %}
       {% endwith %}
     {% else %}
        {% with "True" as all_events %}   {# variable for switching more link ind calendar.inc #}
+    <div id="calendar-update">
 	  {% include "cal/calendar.inc" %}
+    </div>
         {% endwith %}
     {% endif %}
 <script type="text/javascript">
-    var calendarUpdateURL = '/calendar/ajax/list/';
+    var calendarUpdateURL = '/calendar/ajax/list/30';
 </script>
 {% endblock %}
diff --git a/templates/cal/eventinfo_nf.inc b/templates/cal/eventinfo_nf.inc
index 7a7e2e8..857cbed 100644
--- a/templates/cal/eventinfo_nf.inc
+++ b/templates/cal/eventinfo_nf.inc
@@ -2,23 +2,35 @@
 <div id="calendarcontainer{{event.id|default_if_none:""}}">
 
 
-<p class="event {% if event.past %}past_event{% else %}event{% endif %}" id="calendar-view-{{event.id|default_if_none:""}}">
-    {% if not new %}
-       <span class="event_date">{{ event.startDate|date:"D d.m.Y H:i" }} {% if event.endDate %} - {% if event.start_end_date_eq %} {{ event.endDate|date:"H:i" }} {% else %} {{ event.endDate|date:"D d.m.Y H:i" }} {% endif %} {% endif %}</span>
-      		{% if event.wikiPage %}<a href="/wiki/{{event.wikiPage}}"> {% endif %}{{ event.name }}{% if event.wikiPage %}</a>{% endif %}
+  {% if not new %}
+  <p class="event {% if event.past %}past_event{% else %}event{% endif %}" id="calendar-view-{{event.id|default_if_none:""}}">
+    <span class="event_date">{{ event.startDate|date:"D d.m.Y H:i" }} {% if event.endDate %} - {% if event.start_end_date_eq %} {{ event.endDate|date:"H:i" }} {% else %} {{ event.endDate|date:"D d.m.Y H:i" }} {% endif %} {% endif %}</span>
+		{% if event.wikiPage %}<a href="/wiki/{{event.wikiPage}}"> {% endif %}{{ event.name }}{% if event.wikiPage %}</a>{% endif %}
 		{% if event.teaser %}<span class="teaser">{{ event.teaser }}</span>{% endif %}
 		{% if event.category %}<span class="category"> | <a href="/calendar/special/Category/{{ event.category }}/">{{ event.category }}</a></span>{% endif %}
 		{% if event.location%}<span class="location"> | <a href="/calendar/special/Location/{{ event.location }}/">{{ event.location }}</a></span>{% endif %}
 
+    {% if user.is_authenticated and not edit_disabled %}
+      <a href='#' class="hoverHidden" onclick="toggleView('calendar', '{{event.id}}', 1); return false;">
+        Edit
+      </a>
+      <a class="hoverHidden" href="{{event.get_icalendar_url}}">ical</a>
+    {%endif %}
+  </p>
+
+  {%else%}
+    <p>
+      <a href='#' class="btn" onclick="toggleView('calendar', '', 1); return false;">
+        Create new event
+      </a>
+    </p>
+    <p><a href="{% url 'cal.views.complete_ical' %}">Download ALL events in ical format</a></p>
+  {%endif %}
+
 
- {% endif %}
-	{% if user.is_authenticated and not edit_disabled %}
-        <a href='#' class="{%if not new %}hoverHidden{%endif%}" onclick="toggleView('calendar', '{% if not new %}{{event.id|default_if_none:""}}{% endif %}', 1); return false;">{%if not new %}Edit{%else%}Create New Event{%endif%}</a> {% endif %}
- 	<a class="hoverHidden" href="{% if not new %}{{event.get_icalendar_url}}{% else %}{% url "cal.views.complete_ical" %}{%endif %}">ical</a>
-	</p>
 	{% if user.is_authenticated %}
 
-    <div class="{% if not event_has_error %}invisible {%endif%}edit" id='calendar-edit-{% if not new %}{{event.id|default_if_none:""}}{% endif %}'>
+    <div class="{% if not event_has_error %}invisible {%endif%}edit-form" id='calendar-edit-{% if not new %}{{event.id|default_if_none:""}}{% endif %}'>
 		<form id='calendar-form-{{event.id|default_if_none:""}}' method="post" action="/calendar/{% if new %}new{%else%}{{event.id|default_if_none:""}}/update{%endif%}/" onsubmit="return false;" onKeyPress="if(enter_pressed(event)){ submit_form($('calendar-form-{{event.id|default_if_none:""}}'), $('eventcontainer{{event.id|default_if_none:""}}')); }">
 		{% csrf_token %}
             <dl>
@@ -44,7 +56,7 @@
 			   <dd> {{ event_form.startDate.errors }} </dd>
 			{% endif %}
 
-			<dt><label>End:</label></dt>
+			<dt><label><b>End</b>:</label></dt>
 
             <dd> {{ event_form.endDate }}</dd>
             {% if event_form.endDate.errors %}
@@ -81,7 +93,7 @@
 			<a href="#" class="toggled" onclick="toggleView('calendar', '{% if not new %}{{event.id|default_if_none:""}}{% endif %}', 0); return false;">Cancel</a>
             </dd>
             </dl>
-            <a style="padding:0.5em; border:1px solid red; background:#ffbbbb;" href="http://metalab.at/wiki/Kalender">Terminkonflikt?</a>
+            <a style="padding:0.5em; border:1px solid red; background:#ffbbbb; display:inline-block; margin: .5em 0;" href="http://metalab.at/wiki/Kalender">Terminkonflikt?</a>
 		</form>
 	</div>
 	{% endif %}
diff --git a/templates/index.html b/templates/index.html
index 32f60ba..e38750b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -17,12 +17,14 @@ <h1><a href="http://metalab.soup.io" target="metalab_soup">Aktueller Content</a>
     <div id='soup_credits'>managed with <a href='http://metalab.at/wiki/Soup'>soup.io</a></div>
   </div>
 	<div id="calendar">
-        <h1><a href="/calendar" title="Veranstaltungen">Events</a></h1>
+    <h1><a href="/calendar" title="Veranstaltungen">Events</a></h1>
+    <div id="calendar-update">
 		{% include "cal/calendar.inc" %}
     </div>
-    <div id="openlab">
-        Interessiert? Dann schau doch am besten <a href="/wiki/Location" title="Anreise">vorbei</a> oder join unseren <a href="xmpp://metalab@conference.jabber.metalab.at">Jabber Multi-User-Chat</a> bzw. eine der <a href="/wiki/Mailinglisten" title="Mailinglisten">Mailinglisten</a>.
-    </div>
+  </div>
+  <div id="openlab">
+      Interessiert? Dann schau doch am besten <a href="/wiki/Location" title="Anreise">vorbei</a> oder join unseren <a href="xmpp://metalab@conference.jabber.metalab.at">Jabber Multi-User-Chat</a> bzw. eine der <a href="/wiki/Mailinglisten" title="Mailinglisten">Mailinglisten</a>.
+  </div>
 </div>
 <div id="column_2">
 {% comment %}