diff --git a/mainwindow.cpp b/mainwindow.cpp
index 8a20671..8de7f93 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -756,7 +756,7 @@ void MainWindow::validateEntries()
         }
 
         m_lastKontierungStart = startBuchung.time;
-        ui->verticalLayout2->addWidget(new BuchungStrip(startBuchung.time, startBuchung.type, ui->scrollAreaWidgetContents));
+        ui->verticalLayout2->addWidget(new BuchungStrip(startBuchung.id, startBuchung.time, startBuchung.type, ui->scrollAreaWidgetContents));
 
         if(kontierungenIter == m_kontierungenModel->constEnd())
         {
@@ -776,8 +776,8 @@ void MainWindow::validateEntries()
             return;
         }
 
-        ui->verticalLayout2->addWidget(new KontierungStrip(QTime(0, 0), kontierung.timespan, kontierung.projekt,
-                                                           kontierung.subprojekt, kontierung.workpackage, kontierung.text));
+        ui->verticalLayout2->addWidget(new KontierungStrip(kontierung.id, kontierung.timespan, kontierung.projekt, kontierung.subprojekt,
+                                                           kontierung.workpackage, kontierung.text, ui->scrollAreaWidgetContents));
 
         if(kontierung.timespan == QTime(0, 0))
         {
@@ -919,7 +919,7 @@ void MainWindow::validateEntries()
                     }
                 }
 
-                ui->verticalLayout2->addWidget(new BuchungStrip(endBuchung.time, endBuchung.type, ui->scrollAreaWidgetContents));
+                ui->verticalLayout2->addWidget(new BuchungStrip(endBuchung.id, endBuchung.time, endBuchung.type, ui->scrollAreaWidgetContents));
             }
         }
     }
diff --git a/strips/buchungstrip.cpp b/strips/buchungstrip.cpp
index ed0c8b9..37d10db 100644
--- a/strips/buchungstrip.cpp
+++ b/strips/buchungstrip.cpp
@@ -3,7 +3,7 @@
 
 #include <QTime>
 
-BuchungStrip::BuchungStrip(const QTime &time, const QString &type, QWidget *parent) :
+BuchungStrip::BuchungStrip(int id, const QTime &time, const QString &type, QWidget *parent) :
     QFrame(parent),
     ui(new Ui::BuchungStrip)
 {
@@ -25,6 +25,8 @@ BuchungStrip::BuchungStrip(const QTime &time, const QString &type, QWidget *pare
         setStyleSheet("background-color: #FFFF7F;");
         ui->labelType->setText(tr("UNKNOWN"));
     }
+
+    ui->labelId->setText(QString::number(id));
 }
 
 BuchungStrip::~BuchungStrip()
diff --git a/strips/buchungstrip.h b/strips/buchungstrip.h
index 894a214..65c86c8 100644
--- a/strips/buchungstrip.h
+++ b/strips/buchungstrip.h
@@ -12,7 +12,7 @@ class BuchungStrip : public QFrame
     Q_OBJECT
 
 public:
-    explicit BuchungStrip(const QTime &time, const QString &type, QWidget *parent = 0);
+    explicit BuchungStrip(int id, const QTime &time, const QString &type, QWidget *parent = 0);
     ~BuchungStrip();
 
 private:
diff --git a/strips/buchungstrip.ui b/strips/buchungstrip.ui
index 2bd6c2d..eeb8ca8 100644
--- a/strips/buchungstrip.ui
+++ b/strips/buchungstrip.ui
@@ -7,21 +7,9 @@
     <x>0</x>
     <y>0</y>
     <width>500</width>
-    <height>50</height>
+    <height>52</height>
    </rect>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>50</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>50</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
@@ -31,7 +19,7 @@
   <property name="frameShadow">
    <enum>QFrame::Raised</enum>
   </property>
-  <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1">
+  <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0">
    <property name="spacing">
     <number>20</number>
    </property>
@@ -65,6 +53,16 @@
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="labelId">
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+     <property name="alignment">
+      <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>
diff --git a/strips/kontierungstrip.cpp b/strips/kontierungstrip.cpp
index 607fb43..87023d7 100644
--- a/strips/kontierungstrip.cpp
+++ b/strips/kontierungstrip.cpp
@@ -6,9 +6,8 @@
 
 #include "mainwindow.h"
 
-KontierungStrip::KontierungStrip(const QTime &startTime, const QTime &endTime, const QString &projekt,
-                                 const QString &subprojekt, const QString &workpackage, const QString &text,
-                                 QWidget *parent) :
+KontierungStrip::KontierungStrip(int id, const QTime &duration, const QString &projekt, const QString &subprojekt,
+                                 const QString &workpackage, const QString &text, QWidget *parent) :
     QFrame(parent),
     ui(new Ui::KontierungStrip)
 {
@@ -16,18 +15,10 @@ KontierungStrip::KontierungStrip(const QTime &startTime, const QTime &endTime, c
 
     setStyleSheet("background-color: #7FFFFF;");
 
-    if(endTime == QTime(0, 0))
-    {
-        ui->labelTime->setText(QStringLiteral("%0 - ???").arg(startTime.toString("HH:mm")));
-        ui->labelDuration->setText(QStringLiteral("(???h)"));
-    }
-    else
-    {
-        ui->labelTime->setText(startTime.toString("HH:mm") % " - " % endTime.toString("HH:mm"));
-        ui->labelDuration->setText("(" % MainWindow::timeBetween(startTime, endTime).toString("HH:mm") % "h)");
-    }
-
+    ui->labelTime->setText(duration == QTime(0, 0) ? QStringLiteral("???") : duration.toString("HH:mm"));
     ui->labelProjekt->setText(projekt);
+    ui->labelId->setText(QString::number(id));
+
     ui->labelSubprojekt->setText(subprojekt);
     ui->labelWorkpackage->setText(workpackage);
     ui->labelText->setText(text);
diff --git a/strips/kontierungstrip.h b/strips/kontierungstrip.h
index e777a9c..03ee828 100644
--- a/strips/kontierungstrip.h
+++ b/strips/kontierungstrip.h
@@ -12,9 +12,8 @@ class KontierungStrip : public QFrame
     Q_OBJECT
 
 public:
-    explicit KontierungStrip(const QTime &startTime, const QTime &endTime, const QString &projekt,
-                             const QString &subprojekt, const QString &workpackage, const QString &text,
-                             QWidget *parent = 0);
+    explicit KontierungStrip(int id, const QTime &duration, const QString &projekt, const QString &subprojekt,
+                             const QString &workpackage, const QString &text, QWidget *parent = 0);
     ~KontierungStrip();
 
 private:
diff --git a/strips/kontierungstrip.ui b/strips/kontierungstrip.ui
index 445cc18..6cda14b 100644
--- a/strips/kontierungstrip.ui
+++ b/strips/kontierungstrip.ui
@@ -10,18 +10,6 @@
     <height>102</height>
    </rect>
   </property>
-  <property name="minimumSize">
-   <size>
-    <width>0</width>
-    <height>100</height>
-   </size>
-  </property>
-  <property name="maximumSize">
-   <size>
-    <width>16777215</width>
-    <height>102</height>
-   </size>
-  </property>
   <property name="windowTitle">
    <string>Form</string>
   </property>
@@ -36,7 +24,7 @@
     <number>20</number>
    </property>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
+    <layout class="QHBoxLayout" name="horizontalLayout" stretch="0,1,0">
      <item>
       <widget class="QLabel" name="labelTime">
        <property name="font">
@@ -56,7 +44,7 @@
       </widget>
      </item>
      <item>
-      <widget class="QLabel" name="labelDuration">
+      <widget class="QLabel" name="labelProjekt">
        <property name="font">
         <font>
          <pointsize>20</pointsize>
@@ -67,17 +55,20 @@
        </property>
       </widget>
      </item>
-    </layout>
-   </item>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QLabel" name="labelProjekt">
+      <widget class="QLabel" name="labelId">
        <property name="text">
         <string>TextLabel</string>
        </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing</set>
+       </property>
       </widget>
      </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QHBoxLayout" name="horizontalLayout_2" stretch="0,0,1">
      <item>
       <widget class="QLabel" name="labelSubprojekt">
        <property name="text">