diff --git a/gui/include/Catalogue/CatalogueInspectorWidget.h b/gui/include/Catalogue/CatalogueInspectorWidget.h
index d08f208..4eb2e36 100644
--- a/gui/include/Catalogue/CatalogueInspectorWidget.h
+++ b/gui/include/Catalogue/CatalogueInspectorWidget.h
@@ -1,5 +1,5 @@
-#ifndef CATALOGUEINSPECTORWIDGET_H
-#define CATALOGUEINSPECTORWIDGET_H
+#ifndef SCIQLOP_CATALOGUEINSPECTORWIDGET_H
+#define SCIQLOP_CATALOGUEINSPECTORWIDGET_H
 
 #include <QWidget>
 
@@ -12,10 +12,18 @@ class CatalogueInspectorWidget : public QWidget {
 
 public:
     explicit CatalogueInspectorWidget(QWidget *parent = 0);
-    ~CatalogueInspectorWidget();
+    virtual ~CatalogueInspectorWidget();
+
+    /// Enum matching the pages inside the stacked widget
+    enum class Page { Empty, CatalogueProperties, EventProperties };
+
+    Page currentPage() const;
+
+public slots:
+    void showPage(Page page);
 
 private:
     Ui::CatalogueInspectorWidget *ui;
 };
 
-#endif // CATALOGUEINSPECTORWIDGET_H
+#endif // SCIQLOP_CATALOGUEINSPECTORWIDGET_H
diff --git a/gui/src/Catalogue/CatalogueInspectorWidget.cpp b/gui/src/Catalogue/CatalogueInspectorWidget.cpp
index 1e3ee05..6ef48cc 100644
--- a/gui/src/Catalogue/CatalogueInspectorWidget.cpp
+++ b/gui/src/Catalogue/CatalogueInspectorWidget.cpp
@@ -5,9 +5,20 @@ CatalogueInspectorWidget::CatalogueInspectorWidget(QWidget *parent)
         : QWidget(parent), ui(new Ui::CatalogueInspectorWidget)
 {
     ui->setupUi(this);
+    showPage(Page::Empty);
 }
 
 CatalogueInspectorWidget::~CatalogueInspectorWidget()
 {
     delete ui;
 }
+
+void CatalogueInspectorWidget::showPage(CatalogueInspectorWidget::Page page)
+{
+    ui->stackedWidget->setCurrentIndex(static_cast<int>(page));
+}
+
+CatalogueInspectorWidget::Page CatalogueInspectorWidget::currentPage() const
+{
+    return static_cast<Page>(ui->stackedWidget->currentIndex());
+}
diff --git a/gui/ui/Catalogue/CatalogueInspectorWidget.ui b/gui/ui/Catalogue/CatalogueInspectorWidget.ui
index cfe1955..a48ffea 100644
--- a/gui/ui/Catalogue/CatalogueInspectorWidget.ui
+++ b/gui/ui/Catalogue/CatalogueInspectorWidget.ui
@@ -14,18 +14,30 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Inspector</string>
+    <widget class="QFrame" name="frame">
+     <property name="frameShape">
+      <enum>QFrame::Box</enum>
      </property>
-     <property name="flat">
-      <bool>false</bool>
+     <property name="frameShadow">
+      <enum>QFrame::Sunken</enum>
+     </property>
+     <property name="lineWidth">
+      <number>1</number>
      </property>
      <layout class="QVBoxLayout" name="verticalLayout">
-      <property name="spacing">
-       <number>0</number>
-      </property>
       <property name="leftMargin">
        <number>0</number>
       </property>
@@ -41,35 +53,36 @@
       <item>
        <widget class="QStackedWidget" name="stackedWidget">
         <property name="currentIndex">
-         <number>0</number>
+         <number>2</number>
         </property>
+        <widget class="QWidget" name="emptyPage"/>
         <widget class="QWidget" name="catalogueInspectorPage">
          <layout class="QGridLayout" name="gridLayout_2">
-          <item row="0" column="0">
+          <item row="1" column="0">
            <widget class="QLabel" name="label_7">
             <property name="text">
              <string>Name</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
+          <item row="1" column="1">
            <widget class="QLineEdit" name="lineEdit_5"/>
           </item>
-          <item row="1" column="0">
+          <item row="2" column="0">
            <widget class="QLabel" name="label_8">
             <property name="text">
              <string>Author</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="2" column="1">
            <widget class="QLineEdit" name="lineEdit_6">
             <property name="text">
              <string/>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
+          <item row="3" column="1">
            <spacer name="verticalSpacer_2">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -82,71 +95,85 @@
             </property>
            </spacer>
           </item>
+          <item row="0" column="0" colspan="2">
+           <widget class="QLabel" name="label_9">
+            <property name="font">
+             <font>
+              <pointsize>10</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>Catalogue Properties</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
         <widget class="QWidget" name="eventInspectorPage">
          <layout class="QGridLayout" name="gridLayout">
-          <item row="4" column="1">
+          <item row="5" column="1">
            <widget class="QDateTimeEdit" name="dateTimeEdit_2"/>
           </item>
-          <item row="3" column="0">
+          <item row="4" column="0">
            <widget class="QLabel" name="label_4">
             <property name="text">
              <string>TStart</string>
             </property>
            </widget>
           </item>
-          <item row="5" column="0">
+          <item row="6" column="0">
            <widget class="QLabel" name="label_6">
             <property name="text">
              <string>Tags</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="0">
+          <item row="3" column="0">
            <widget class="QLabel" name="label_3">
             <property name="text">
              <string>Product</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
+          <item row="3" column="1">
            <widget class="QLineEdit" name="lineEdit_3"/>
           </item>
-          <item row="4" column="0">
+          <item row="5" column="0">
            <widget class="QLabel" name="label_5">
             <property name="text">
              <string>Tend</string>
             </property>
            </widget>
           </item>
-          <item row="3" column="1">
+          <item row="4" column="1">
            <widget class="QDateTimeEdit" name="dateTimeEdit"/>
           </item>
-          <item row="1" column="0">
+          <item row="2" column="0">
            <widget class="QLabel" name="label_2">
             <property name="text">
              <string>Mission</string>
             </property>
            </widget>
           </item>
-          <item row="0" column="1">
+          <item row="1" column="1">
            <widget class="QLineEdit" name="lineEdit"/>
           </item>
-          <item row="0" column="0">
+          <item row="1" column="0">
            <widget class="QLabel" name="label">
             <property name="text">
-             <string>Event Name</string>
+             <string>Name</string>
             </property>
            </widget>
           </item>
-          <item row="1" column="1">
+          <item row="2" column="1">
            <widget class="QLineEdit" name="lineEdit_2"/>
           </item>
-          <item row="5" column="1">
+          <item row="6" column="1">
            <widget class="QLineEdit" name="lineEdit_4"/>
           </item>
-          <item row="6" column="1">
+          <item row="7" column="1">
            <spacer name="verticalSpacer">
             <property name="orientation">
              <enum>Qt::Vertical</enum>
@@ -159,6 +186,20 @@
             </property>
            </spacer>
           </item>
+          <item row="0" column="0" colspan="2">
+           <widget class="QLabel" name="label_10">
+            <property name="font">
+             <font>
+              <pointsize>10</pointsize>
+              <weight>75</weight>
+              <bold>true</bold>
+             </font>
+            </property>
+            <property name="text">
+             <string>Event Properties</string>
+            </property>
+           </widget>
+          </item>
          </layout>
         </widget>
        </widget>