diff --git a/views/calendar/qml/DayChooser.qml b/views/calendar/qml/DayChooser.qml
index a18bafd0..0a40b1a9 100644
--- a/views/calendar/qml/DayChooser.qml
+++ b/views/calendar/qml/DayChooser.qml
@@ -1,124 +1,129 @@
 /*
  *  Copyright (C) 2017 Michael Bohlender, <bohlender@kolabsys.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 import QtQuick 2.7
 import QtQuick.Layouts 1.2
 import org.kube.framework 1.0 as Kube
 import Qt.labs.calendar 1.0
 
 Item {
     id: root
 
     height: button.height
     width: button.width
 
     Kube.Button {
         id: button
 
         text: "Choose Date"
 
         onClicked: {
             popup.open()
         }
 
         Kube.Popup {
             id: popup
 
             property var year: 2018
             property var month: Calendar.April
 
             x: button.x
             y: button.y + button.height
             width: monthGrid.width + Kube.Units.largeSpacing * 2
             height: monthGrid.height + Kube.Units.largeSpacing * 2
             modal: true
             focus: true
 
             ColumnLayout {
                 id: monthGrid
 
                 anchors.centerIn: parent
 
                 RowLayout {
                     Kube.Label {
                         text: "May" //FIXME popup.month
                     }
                     Kube.Label {
                         text: popup.year
                     }
                     Kube.IconButton {
                         iconName: Kube.Icons.goUp
 
                         onClicked: {
                             if (popup.month == Calendar.January) {
                                 popup.month = Calendar.December
                                 popup.year--;
                             } else {
                                 popup.month--;
                             }
                         }
 
                     }
                     Kube.IconButton {
                         iconName: Kube.Icons.goDown
 
                         onClicked: {
                             if (popup.month == Calendar.December) {
                                 popup.month = Calendar.January
                                 popup.year++;
                             } else {
                                 popup.month++;
                             }
                         }
                     }
                 }
 
                 GridLayout {
 
                     columns: 2
 
                     DayOfWeekRow {
                         locale: grid.locale
 
                         Layout.column: 1
                         Layout.fillWidth: true
-
                     }
 
                     WeekNumberColumn {
                         month: grid.month
                         year: grid.year
                         locale: grid.locale
 
                         Layout.fillHeight: true
                     }
 
                     MonthGrid {
                         id: grid
                         month: popup.month
                         year: popup.year
                         locale: Qt.locale("en_GB") //FIXME
 
                         Layout.fillWidth: true
                         Layout.fillHeight: true
+
+                        delegate: Kube.AbstractButton {
+                            text: model.day
+
+                            width: Kube.Units.gridUnit * 3
+                        }
                     }
                 }
             }
         }
     }
 }
diff --git a/views/calendar/qml/EventView.qml b/views/calendar/qml/EventView.qml
index 6f34cefa..c86f0f42 100644
--- a/views/calendar/qml/EventView.qml
+++ b/views/calendar/qml/EventView.qml
@@ -1,94 +1,107 @@
 /*
  *  Copyright (C) 2018 Michael Bohlender, <bohlender@kolabsys.com>
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
  *  the Free Software Foundation; either version 2 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
  *  but WITHOUT ANY WARRANTY; without even the implied warranty of
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License along
  *  with this program; if not, write to the Free Software Foundation, Inc.,
  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 import QtQuick 2.4
 import QtQuick.Layouts 1.1
 import QtQuick.Controls 2.3
 import Qt.labs.calendar 1.0
 
 import org.kube.framework 1.0 as Kube
 
 FocusScope {
     id: root
 
+    property bool daylong
+
     Rectangle {
         anchors {
             top: parent.top
             topMargin: Kube.Units.largeSpacing
             horizontalCenter: parent.horizontalCenter
         }
 
         width: Kube.Units.gridUnit * 7 * 7 + Kube.Units.gridUnit * 2
         height: Kube.Units.gridUnit * 27
 
         color: Kube.Colors.viewBackgroundColor
 
         Column {
 
             anchors {
                 fill: parent
                 margins: Kube.Units.smallSpacing
             }
 
             spacing: Kube.Units.largeSpacing
 
             Kube.TextField {
                 width: parent.width
-                placeholderText: "Titel"
+                placeholderText: "Title"
             }
             RowLayout {
                 spacing: Kube.Units.smallSpacing
 
                 DayChooser { }
 
-                TimeChooser { }
+                TimeChooser {
+                    visible: !root.daylong
+                }
 
                 Kube.Label {
                     text: " " + qsTr("till") + " "
                 }
 
                 DayChooser { }
 
-                TimeChooser { }
+                TimeChooser {
+                   visible: !root.daylong
+
+                }
             }
 
             RowLayout {
                 spacing: Kube.Units.largeSpacing
 
                 RowLayout {
                     Layout.fillHeight: true
-                Kube.CheckBox {
-                }
+                    Kube.CheckBox {
+                        checked: root.daylong
 
-                Kube.Label {
-                    text: "daylong"
-                }
+                        onClicked: {
+                            root.daylong = !root.daylong
+                        }
+                    }
+
+                    Kube.Label {
+                        text: "daylong"
+                    }
                 }
 
                 Kube.ComboBox {
-                    model: ["once", "reoccuring"]
+                    model: ["once", "dayly", "weekly"]
+
                 }
             }
 
             Kube.TextEditor {
                 width: parent.width
                 height: 200
             }
         }
     }
 }