diff --git a/plugins/calendar/skins/elastic/templates/itipattend.html b/plugins/calendar/skins/elastic/templates/itipattend.html
index 20b4acab..2b3ce326 100644
--- a/plugins/calendar/skins/elastic/templates/itipattend.html
+++ b/plugins/calendar/skins/elastic/templates/itipattend.html
@@ -1,29 +1,10 @@
-<roundcube:object name="doctype" value="html5" />
-<html>
-<head>
-<title><roundcube:object name="pagetitle" /></title>
-<roundcube:include file="/includes/links.html" />
-</head>
-<body class="extwin calendaritipattend">
+<roundcube:include file="includes/layout.html" />
 
-<div id="header">
-<div id="topnav">
-	<roundcube:object name="logo" src="/images/roundcube_logo.png" id="toplogo" border="0" alt="Logo" />
-</div>
-</div>
+<roundcube:object name="plugin.event_inviteform" class="standalone-invitebox" />
+	<div class="calendar-invitebox invitebox boxinformation">
+		<roundcube:object name="plugin.event_invitebox" />
+		<roundcube:object name="plugin.event_rsvp_buttons" type="submit" iname="rsvp" id="event-rsvp" delegate="false" />
+	</div>
+</form>
 
-<div id="mainscreen">
-
-<div class="centerbox uibox">
-	<roundcube:object name="plugin.event_inviteform" />
-	<roundcube:object name="plugin.event_invitebox" class="calendar-invitebox" />
-	<roundcube:object name="plugin.event_rsvp_buttons" type="submit" iname="rsvp" id="event-rsvp" delegate="false" />
-	</form>
-</div>
-
-<roundcube:object name="message" id="message" />
-
-</div>
-
-</body>
-</html>
\ No newline at end of file
+<roundcube:include file="includes/footer.html" />
diff --git a/plugins/libkolab/skins/elastic/include/calendar.less b/plugins/libkolab/skins/elastic/include/calendar.less
index 163f057a..12ffe523 100644
--- a/plugins/libkolab/skins/elastic/include/calendar.less
+++ b/plugins/libkolab/skins/elastic/include/calendar.less
@@ -1171,3 +1171,16 @@ fieldset.categories .input-group {
         }
     }
 }
+
+.standalone-invitebox {
+    margin: 0 auto;
+    padding-top: 36vh;
+    max-width: 500px;
+    width: 95%;
+    background: url(../../../../skins/elastic/images/watermark.jpg) center -20px no-repeat;
+    background-size: auto 40%;
+
+    .invitebox {
+        border: 1px solid @color-layout-border !important;
+    }
+}
diff --git a/plugins/libkolab/skins/elastic/include/libcalendaring.less b/plugins/libkolab/skins/elastic/include/libcalendaring.less
index f062cdbd..febf93ae 100644
--- a/plugins/libkolab/skins/elastic/include/libcalendaring.less
+++ b/plugins/libkolab/skins/elastic/include/libcalendaring.less
@@ -34,6 +34,7 @@
 
     td {
         padding: 2px;
+        vertical-align: top;
 
         &.ititle {
             font-weight: bold;
