diff --git a/frontend/generated/vaadin-featureflags.ts b/frontend/generated/vaadin-featureflags.ts
index 0f81f16..d0581a6 100644
--- a/frontend/generated/vaadin-featureflags.ts
+++ b/frontend/generated/vaadin-featureflags.ts
@@ -3,8 +3,4 @@ window.Vaadin = window.Vaadin || {};
 window.Vaadin.featureFlags = window.Vaadin.featureFlags || {};
 window.Vaadin.featureFlags.exampleFeatureFlag = false;
 window.Vaadin.featureFlags.viteForFrontendBuild = false;
-window.Vaadin.featureFlags.mapComponent = false;
-window.Vaadin.featureFlags.spreadsheetComponent = false;
-window.Vaadin.featureFlags.hillaPush = false;
-window.Vaadin.featureFlags.newLicenseChecker = false;
-window.Vaadin.featureFlags.collaborationEngineBackend = false;
\ No newline at end of file
+window.Vaadin.featureFlags.mapComponent = false;
\ No newline at end of file
diff --git a/package.json b/package.json
index 5defa90..e7956ed 100644
--- a/package.json
+++ b/package.json
@@ -116,10 +116,10 @@
     "@vaadin/vaadin-virtual-list": "23.1.0",
     "@vaadin/vertical-layout": "23.1.0",
     "@vaadin/virtual-list": "23.1.0",
-    "construct-style-sheets-polyfill": "3.1.0",
+    "construct-style-sheets-polyfill": "3.0.4",
     "date-fns": "2.28.0",
     "line-awesome": "1.3.0",
-    "lit": "2.2.3"
+    "lit": "2.1.4"
   },
   "devDependencies": {
     "async": "3.2.2",
@@ -379,10 +379,10 @@
       "@vaadin/vaadin-virtual-list": "23.1.0",
       "@vaadin/vertical-layout": "23.1.0",
       "@vaadin/virtual-list": "23.1.0",
-      "construct-style-sheets-polyfill": "3.1.0",
+      "construct-style-sheets-polyfill": "3.0.4",
       "date-fns": "2.28.0",
       "line-awesome": "1.3.0",
-      "lit": "2.2.3"
+      "lit": "2.1.4"
     },
     "devDependencies": {
       "async": "3.2.2",
diff --git a/src/main/java/com/privacydashboard/application/views/apps/AvailableAppsView.java b/src/main/java/com/privacydashboard/application/views/apps/AvailableAppsView.java
index 916155b..4ed72b5 100644
--- a/src/main/java/com/privacydashboard/application/views/apps/AvailableAppsView.java
+++ b/src/main/java/com/privacydashboard/application/views/apps/AvailableAppsView.java
@@ -369,7 +369,13 @@ public AvailableAppsView(DataBaseService dataBaseService, AuthenticatedUser auth
         }
         catch(Exception e){
             System.out.println("Exception: "+e);
-            Span exNotice = e.getMessage().equals("Size was 0") ? new Span("You do not have any apps.") : new Span("We could not retrieve your apps.");
+            Span exNotice = new Span();
+            if(e.getMessage() == "Size was 0"){
+                exNotice.add("There are no available apps.");
+            }
+            else{
+                exNotice.add("We could not retrieve the available apps.");
+            }
             exNotice.addClassName("bold");
             appLayout.add(exNotice);
         }
diff --git a/src/main/java/com/privacydashboard/application/views/home/HomeView.java b/src/main/java/com/privacydashboard/application/views/home/HomeView.java
index e61d944..4e92253 100644
--- a/src/main/java/com/privacydashboard/application/views/home/HomeView.java
+++ b/src/main/java/com/privacydashboard/application/views/home/HomeView.java
@@ -59,7 +59,7 @@ private void initializeLayout(){
     private void createSections(){
         createSingleSection(0, "Contacts", "contacts", "la-address-book");
         createSingleSection(1, "Messages", "messages", "la-comments");
-        createSingleSection(3, "Available Apps", "available_apps-view", "la-list");
+        createSingleSection(3, "Available Apps", "available-apps-view", "la-list");
         createSingleSection(4, "Apps", "apps-view", "la-list");
         createSingleSection(5, "Privacy Notice", "privacyNotice", "la-file");
         if(authenticatedUser.getUser().getRole().equals(Role.CONTROLLER) || authenticatedUser.getUser().getRole().equals(Role.DPO)){
diff --git a/src/test/java/com/privacydashboard/application/views/home/HomeViewTest.java b/src/test/java/com/privacydashboard/application/views/home/HomeViewTest.java
index 1fd40ed..81ab2da 100644
--- a/src/test/java/com/privacydashboard/application/views/home/HomeViewTest.java
+++ b/src/test/java/com/privacydashboard/application/views/home/HomeViewTest.java
@@ -52,115 +52,138 @@ private static void setup(){
 
     @Test
     public void HomeViewSubjectConstructorTest(){
+
         assertEquals(subjectView.getElement().getAttribute("class"), "home-view");
 
-        assertEquals(subjectView.getElement().getChild(0).getTag(), "vaadin-horizontal-layout");
-
-        assertEquals(subjectView.getElement().getChild(0).getChild(0).getTag(), "vaadin-vertical-layout");
-        assertEquals(subjectView.getElement().getChild(0).getChild(0).getAttribute("class"), "section pointer");
-        assertEquals(subjectView.getElement().getChild(0).getChild(0).getChild(0).getTag(), "span");
-        assertEquals(subjectView.getElement().getChild(0).getChild(0).getChild(0).getAttribute("class"), "title");
-        assertEquals(subjectView.getElement().getChild(0).getChild(0).getChild(0).getText(), "Contacts");
-        assertEquals(subjectView.getElement().getChild(0).getChild(0).getChild(1).getTag(), "div");
-        assertEquals(subjectView.getElement().getChild(0).getChild(0).getChild(1).getAttribute("class").contains("las la-10x icons la-address-book"), true);
-
-        assertEquals(subjectView.getElement().getChild(0).getChild(1).getTag(), "vaadin-vertical-layout");
-        assertEquals(subjectView.getElement().getChild(0).getChild(1).getAttribute("class"), "section pointer");
-        assertEquals(subjectView.getElement().getChild(0).getChild(1).getChild(0).getTag(), "span");
-        assertEquals(subjectView.getElement().getChild(0).getChild(1).getChild(0).getAttribute("class"), "title");
-        assertEquals(subjectView.getElement().getChild(0).getChild(1).getChild(0).getText(), "Messages");
-        assertEquals(subjectView.getElement().getChild(0).getChild(1).getChild(1).getTag(), "div");
-        assertEquals(subjectView.getElement().getChild(0).getChild(1).getChild(1).getAttribute("class").contains("las la-10x icons la-comments"), true);
-
-        assertEquals(subjectView.getElement().getChild(0).getChild(2).getTag(), "vaadin-vertical-layout");
-        assertEquals(subjectView.getElement().getChild(0).getChild(2).getAttribute("class"), "section pointer");
-        assertEquals(subjectView.getElement().getChild(0).getChild(2).getChild(0).getTag(), "span");
-        assertEquals(subjectView.getElement().getChild(0).getChild(2).getChild(0).getAttribute("class"), "title");
-        assertEquals(subjectView.getElement().getChild(0).getChild(2).getChild(0).getText(), "Rights");
-        assertEquals(subjectView.getElement().getChild(0).getChild(2).getChild(1).getTag(), "div");
-        assertEquals(subjectView.getElement().getChild(0).getChild(2).getChild(1).getAttribute("class").contains("las la-10x icons la-school"), true);
-
-        assertEquals(subjectView.getElement().getChild(1).getTag(), "vaadin-horizontal-layout");
-
-        assertEquals(subjectView.getElement().getChild(1).getChild(0).getTag(), "vaadin-vertical-layout");
-        assertEquals(subjectView.getElement().getChild(1).getChild(0).getAttribute("class"), "section pointer");
-        assertEquals(subjectView.getElement().getChild(1).getChild(0).getChild(0).getTag(), "span");
-        assertEquals(subjectView.getElement().getChild(1).getChild(0).getChild(0).getAttribute("class"), "title");
-        assertEquals(subjectView.getElement().getChild(1).getChild(0).getChild(0).getText(), "Apps");
-        assertEquals(subjectView.getElement().getChild(1).getChild(0).getChild(1).getTag(), "div");
-        assertEquals(subjectView.getElement().getChild(1).getChild(0).getChild(1).getAttribute("class").contains("las la-10x icons la-list"), true);
-
-        assertEquals(subjectView.getElement().getChild(1).getChild(1).getTag(), "vaadin-vertical-layout");
-        assertEquals(subjectView.getElement().getChild(1).getChild(1).getAttribute("class"), "section pointer");
-        assertEquals(subjectView.getElement().getChild(1).getChild(1).getChild(0).getTag(), "span");
-        assertEquals(subjectView.getElement().getChild(1).getChild(1).getChild(0).getAttribute("class"), "title");
-        assertEquals(subjectView.getElement().getChild(1).getChild(1).getChild(0).getText(), "Privacy Notice");
-        assertEquals(subjectView.getElement().getChild(1).getChild(1).getChild(1).getTag(), "div");
-        assertEquals(subjectView.getElement().getChild(1).getChild(1).getChild(1).getAttribute("class").contains("las la-10x icons la-file"), true);
-
-        assertEquals(subjectView.getElement().getChild(1).getChild(2).getTag(), "vaadin-vertical-layout");
-        assertEquals(subjectView.getElement().getChild(1).getChild(2).getAttribute("class"), "section pointer");
-        assertEquals(subjectView.getElement().getChild(1).getChild(2).getChild(0).getTag(), "span");
-        assertEquals(subjectView.getElement().getChild(1).getChild(2).getChild(0).getAttribute("class"), "title");
-        assertEquals(subjectView.getElement().getChild(1).getChild(2).getChild(0).getText(), "Pending Requests");
-        assertEquals(subjectView.getElement().getChild(1).getChild(2).getChild(1).getTag(), "div");
-        assertEquals(subjectView.getElement().getChild(1).getChild(2).getChild(1).getAttribute("class").contains("las la-10x icons la-archive"), true);
+        assertEquals(subjectView.getElement().getChild(0).getTag(), "vaadin-vertical-layout");        
+        assertEquals(subjectView.getElement().getChild(0).getAttribute("class"), "section pointer");
+
+        assertEquals(subjectView.getElement().getChild(0).getChild(0).getTag(), "span");
+        assertEquals(subjectView.getElement().getChild(0).getChild(0).getAttribute("class"), "title");
+        assertEquals(subjectView.getElement().getChild(0).getChild(0).getText(), "Contacts");
+        assertEquals(subjectView.getElement().getChild(0).getChild(1).getTag(), "div");
+        assertEquals(subjectView.getElement().getChild(0).getChild(1).getAttribute("class").contains("las la-10x icons la-address-book"), true);
+
+        assertEquals(subjectView.getElement().getChild(1).getTag(), "vaadin-vertical-layout");        
+        assertEquals(subjectView.getElement().getChild(1).getAttribute("class"), "section pointer");
+
+        assertEquals(subjectView.getElement().getChild(1).getChild(0).getTag(), "span");
+        assertEquals(subjectView.getElement().getChild(1).getChild(0).getAttribute("class"), "title");
+        assertEquals(subjectView.getElement().getChild(1).getChild(0).getText(), "Messages");
+        assertEquals(subjectView.getElement().getChild(1).getChild(1).getTag(), "div");
+        assertEquals(subjectView.getElement().getChild(1).getChild(1).getAttribute("class").contains("las la-10x icons la-comments"), true);
+
+        assertEquals(subjectView.getElement().getChild(2).getTag(), "vaadin-vertical-layout");        
+        assertEquals(subjectView.getElement().getChild(2).getAttribute("class"), "section pointer");
+
+        assertEquals(subjectView.getElement().getChild(2).getChild(0).getTag(), "span");
+        assertEquals(subjectView.getElement().getChild(2).getChild(0).getAttribute("class"), "title");
+        assertEquals(subjectView.getElement().getChild(2).getChild(0).getText(), "Rights");
+        assertEquals(subjectView.getElement().getChild(2).getChild(1).getTag(), "div");
+        assertEquals(subjectView.getElement().getChild(2).getChild(1).getAttribute("class").contains("las la-10x icons la-school"), true);
+
+        assertEquals(subjectView.getElement().getChild(3).getTag(), "vaadin-vertical-layout");        
+        assertEquals(subjectView.getElement().getChild(3).getAttribute("class"), "section pointer");
+
+        assertEquals(subjectView.getElement().getChild(3).getChild(0).getTag(), "span");
+        assertEquals(subjectView.getElement().getChild(3).getChild(0).getAttribute("class"), "title");
+        assertEquals(subjectView.getElement().getChild(3).getChild(0).getText(), "Available Apps");
+        assertEquals(subjectView.getElement().getChild(3).getChild(1).getTag(), "div");
+        assertEquals(subjectView.getElement().getChild(3).getChild(1).getAttribute("class").contains("las la-10x icons la-list"), true);
+
+        assertEquals(subjectView.getElement().getChild(4).getTag(), "vaadin-vertical-layout");        
+        assertEquals(subjectView.getElement().getChild(4).getAttribute("class"), "section pointer");
+
+        assertEquals(subjectView.getElement().getChild(4).getChild(0).getTag(), "span");
+        assertEquals(subjectView.getElement().getChild(4).getChild(0).getAttribute("class"), "title");
+        assertEquals(subjectView.getElement().getChild(4).getChild(0).getText(), "Apps");
+        assertEquals(subjectView.getElement().getChild(4).getChild(1).getTag(), "div");
+        assertEquals(subjectView.getElement().getChild(4).getChild(1).getAttribute("class").contains("las la-10x icons la-list"), true);
+
+        assertEquals(subjectView.getElement().getChild(5).getTag(), "vaadin-vertical-layout");        
+        assertEquals(subjectView.getElement().getChild(5).getAttribute("class"), "section pointer");
+
+        assertEquals(subjectView.getElement().getChild(5).getChild(0).getTag(), "span");
+        assertEquals(subjectView.getElement().getChild(5).getChild(0).getAttribute("class"), "title");
+        assertEquals(subjectView.getElement().getChild(5).getChild(0).getText(), "Privacy Notice");
+        assertEquals(subjectView.getElement().getChild(5).getChild(1).getTag(), "div");
+        assertEquals(subjectView.getElement().getChild(5).getChild(1).getAttribute("class").contains("las la-10x icons la-file"), true);
+
+        assertEquals(subjectView.getElement().getChild(6).getTag(), "vaadin-vertical-layout");        
+        assertEquals(subjectView.getElement().getChild(6).getAttribute("class"), "section pointer");
+
+        assertEquals(subjectView.getElement().getChild(6).getChild(0).getTag(), "span");
+        assertEquals(subjectView.getElement().getChild(6).getChild(0).getAttribute("class"), "title");
+        assertEquals(subjectView.getElement().getChild(6).getChild(0).getText(), "Pending Requests");
+        assertEquals(subjectView.getElement().getChild(6).getChild(1).getTag(), "div");
+        assertEquals(subjectView.getElement().getChild(6).getChild(1).getAttribute("class").contains("las la-10x icons la-archive"), true);
     }
 
     @Test
     public void HomeViewNotSubjectConstructorTest(){
         assertEquals(notSubjectView.getElement().getAttribute("class"), "home-view");
 
-        assertEquals(notSubjectView.getElement().getChild(0).getTag(), "vaadin-horizontal-layout");
-
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(0).getTag(), "vaadin-vertical-layout");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(0).getAttribute("class"), "section pointer");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(0).getChild(0).getTag(), "span");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(0).getChild(0).getAttribute("class"), "title");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(0).getChild(0).getText(), "Contacts");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(0).getChild(1).getTag(), "div");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(0).getChild(1).getAttribute("class").contains("las la-10x icons la-address-book"), true);
-
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(1).getTag(), "vaadin-vertical-layout");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(1).getAttribute("class"), "section pointer");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(1).getChild(0).getTag(), "span");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(1).getChild(0).getAttribute("class"), "title");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(1).getChild(0).getText(), "Messages");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(1).getChild(1).getTag(), "div");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(1).getChild(1).getAttribute("class").contains("las la-10x icons la-comments"), true);
-
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(2).getTag(), "vaadin-vertical-layout");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(2).getAttribute("class"), "section pointer");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(2).getChild(0).getTag(), "span");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(2).getChild(0).getAttribute("class"), "title");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(2).getChild(0).getText(), "Rights");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(2).getChild(1).getTag(), "div");
-        assertEquals(notSubjectView.getElement().getChild(0).getChild(2).getChild(1).getAttribute("class").contains("las la-10x icons la-school"), true);
-
-        assertEquals(notSubjectView.getElement().getChild(1).getTag(), "vaadin-horizontal-layout");
-
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(0).getTag(), "vaadin-vertical-layout");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(0).getAttribute("class"), "section pointer");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(0).getChild(0).getTag(), "span");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(0).getChild(0).getAttribute("class"), "title");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(0).getChild(0).getText(), "Apps");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(0).getChild(1).getTag(), "div");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(0).getChild(1).getAttribute("class").contains("las la-10x icons la-list"), true);
-
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(1).getTag(), "vaadin-vertical-layout");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(1).getAttribute("class"), "section pointer");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(1).getChild(0).getTag(), "span");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(1).getChild(0).getAttribute("class"), "title");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(1).getChild(0).getText(), "Privacy Notice");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(1).getChild(1).getTag(), "div");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(1).getChild(1).getAttribute("class").contains("las la-10x icons la-file"), true);
-
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(2).getTag(), "vaadin-vertical-layout");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(2).getAttribute("class"), "section pointer");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(2).getChild(0).getTag(), "span");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(2).getChild(0).getAttribute("class"), "title");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(2).getChild(0).getText(), "Questionnaire");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(2).getChild(1).getTag(), "div");
-        assertEquals(notSubjectView.getElement().getChild(1).getChild(2).getChild(1).getAttribute("class").contains("las la-10x icons la-archive"), true);
+        assertEquals(notSubjectView.getElement().getChild(0).getTag(), "vaadin-vertical-layout");        
+        assertEquals(notSubjectView.getElement().getChild(0).getAttribute("class"), "section pointer");
+
+        assertEquals(notSubjectView.getElement().getChild(0).getChild(0).getTag(), "span");
+        assertEquals(notSubjectView.getElement().getChild(0).getChild(0).getAttribute("class"), "title");
+        assertEquals(notSubjectView.getElement().getChild(0).getChild(0).getText(), "Contacts");
+        assertEquals(notSubjectView.getElement().getChild(0).getChild(1).getTag(), "div");
+        assertEquals(notSubjectView.getElement().getChild(0).getChild(1).getAttribute("class").contains("las la-10x icons la-address-book"), true);
+
+        assertEquals(notSubjectView.getElement().getChild(1).getTag(), "vaadin-vertical-layout");        
+        assertEquals(notSubjectView.getElement().getChild(1).getAttribute("class"), "section pointer");
+
+        assertEquals(notSubjectView.getElement().getChild(1).getChild(0).getTag(), "span");
+        assertEquals(notSubjectView.getElement().getChild(1).getChild(0).getAttribute("class"), "title");
+        assertEquals(notSubjectView.getElement().getChild(1).getChild(0).getText(), "Messages");
+        assertEquals(notSubjectView.getElement().getChild(1).getChild(1).getTag(), "div");
+        assertEquals(notSubjectView.getElement().getChild(1).getChild(1).getAttribute("class").contains("las la-10x icons la-comments"), true);
+
+        assertEquals(notSubjectView.getElement().getChild(2).getTag(), "vaadin-vertical-layout");        
+        assertEquals(notSubjectView.getElement().getChild(2).getAttribute("class"), "section pointer");
+
+        assertEquals(notSubjectView.getElement().getChild(2).getChild(0).getTag(), "span");
+        assertEquals(notSubjectView.getElement().getChild(2).getChild(0).getAttribute("class"), "title");
+        assertEquals(notSubjectView.getElement().getChild(2).getChild(0).getText(), "Rights");
+        assertEquals(notSubjectView.getElement().getChild(2).getChild(1).getTag(), "div");
+        assertEquals(notSubjectView.getElement().getChild(2).getChild(1).getAttribute("class").contains("las la-10x icons la-school"), true);
+
+        assertEquals(notSubjectView.getElement().getChild(3).getTag(), "vaadin-vertical-layout");        
+        assertEquals(notSubjectView.getElement().getChild(3).getAttribute("class"), "section pointer");
+
+        assertEquals(notSubjectView.getElement().getChild(3).getChild(0).getTag(), "span");
+        assertEquals(notSubjectView.getElement().getChild(3).getChild(0).getAttribute("class"), "title");
+        assertEquals(notSubjectView.getElement().getChild(3).getChild(0).getText(), "Available Apps");
+        assertEquals(notSubjectView.getElement().getChild(3).getChild(1).getTag(), "div");
+        assertEquals(notSubjectView.getElement().getChild(3).getChild(1).getAttribute("class").contains("las la-10x icons la-list"), true);
+
+        assertEquals(notSubjectView.getElement().getChild(4).getTag(), "vaadin-vertical-layout");        
+        assertEquals(notSubjectView.getElement().getChild(4).getAttribute("class"), "section pointer");
+
+        assertEquals(notSubjectView.getElement().getChild(4).getChild(0).getTag(), "span");
+        assertEquals(notSubjectView.getElement().getChild(4).getChild(0).getAttribute("class"), "title");
+        assertEquals(notSubjectView.getElement().getChild(4).getChild(0).getText(), "Apps");
+        assertEquals(notSubjectView.getElement().getChild(4).getChild(1).getTag(), "div");
+        assertEquals(notSubjectView.getElement().getChild(4).getChild(1).getAttribute("class").contains("las la-10x icons la-list"), true);
+
+        assertEquals(notSubjectView.getElement().getChild(5).getTag(), "vaadin-vertical-layout");        
+        assertEquals(notSubjectView.getElement().getChild(5).getAttribute("class"), "section pointer");
+
+        assertEquals(notSubjectView.getElement().getChild(5).getChild(0).getTag(), "span");
+        assertEquals(notSubjectView.getElement().getChild(5).getChild(0).getAttribute("class"), "title");
+        assertEquals(notSubjectView.getElement().getChild(5).getChild(0).getText(), "Privacy Notice");
+        assertEquals(notSubjectView.getElement().getChild(5).getChild(1).getTag(), "div");
+        assertEquals(notSubjectView.getElement().getChild(5).getChild(1).getAttribute("class").contains("las la-10x icons la-file"), true);
+
+        assertEquals(notSubjectView.getElement().getChild(6).getTag(), "vaadin-vertical-layout");        
+        assertEquals(notSubjectView.getElement().getChild(6).getAttribute("class"), "section pointer");
+
+        assertEquals(notSubjectView.getElement().getChild(6).getChild(0).getTag(), "span");
+        assertEquals(notSubjectView.getElement().getChild(6).getChild(0).getAttribute("class"), "title");
+        assertEquals(notSubjectView.getElement().getChild(6).getChild(0).getText(), "Questionnaire");
+        assertEquals(notSubjectView.getElement().getChild(6).getChild(1).getTag(), "div");
+        assertEquals(notSubjectView.getElement().getChild(6).getChild(1).getAttribute("class").contains("las la-10x icons la-archive"), true);
     }
 }