diff --git a/packages/elements/src/components/Tile/__tests__/__snapshots__/index.tsx.snap b/packages/elements/src/components/Tile/__tests__/__snapshots__/index.tsx.snap
index 22fca03670..e85ab6e513 100644
--- a/packages/elements/src/components/Tile/__tests__/__snapshots__/index.tsx.snap
+++ b/packages/elements/src/components/Tile/__tests__/__snapshots__/index.tsx.snap
@@ -19,7 +19,9 @@ exports[`Tile should match snapshot when HIGHTLIGHT false 1`] = `
         >
           mockHeading
         </Component>
-        <Component />
+        <Component
+          className="text-ellipisis"
+        />
         <div>
           City
         </div>
@@ -57,7 +59,9 @@ exports[`Tile should match snapshot when HIGHTLIGHT true 1`] = `
         >
           mockHeading
         </Component>
-        <Component />
+        <Component
+          className="text-ellipisis"
+        />
         <div>
           City
         </div>
diff --git a/packages/elements/src/components/Tile/index.tsx b/packages/elements/src/components/Tile/index.tsx
index b2e24a1e20..0d4c1909ac 100644
--- a/packages/elements/src/components/Tile/index.tsx
+++ b/packages/elements/src/components/Tile/index.tsx
@@ -44,7 +44,7 @@ export const Tile: React.FC<TileProps> = ({
           ) : null}
           <div className="media-content">
             <H4 className="text-ellipisis">{heading}</H4>
-            <SubTitleH6>{subHeading}</SubTitleH6>
+            <SubTitleH6 className="text-ellipisis">{subHeading}</SubTitleH6>
             {children}
           </div>
           {menu && <div className="media-right">{menu}</div>}
diff --git a/packages/marketplace/src/components/pages/installed-apps/__tests__/__snapshots__/installed-apps.test.tsx.snap b/packages/marketplace/src/components/pages/installed-apps/__tests__/__snapshots__/installed-apps.test.tsx.snap
index 846b0c95bd..988f032dac 100644
--- a/packages/marketplace/src/components/pages/installed-apps/__tests__/__snapshots__/installed-apps.test.tsx.snap
+++ b/packages/marketplace/src/components/pages/installed-apps/__tests__/__snapshots__/installed-apps.test.tsx.snap
@@ -284,9 +284,11 @@ exports[`InstalledApps should match a snapshot when LOADING false 1`] = `
                                               test
                                             </h4>
                                           </Component>
-                                          <Component>
+                                          <Component
+                                            className="text-ellipisis"
+                                          >
                                             <h6
-                                              className="subtitle is-6  "
+                                              className="subtitle is-6 text-ellipisis "
                                               id=""
                                             >
                                               Pete's Proptech World Ltd
@@ -391,9 +393,11 @@ exports[`InstalledApps should match a snapshot when LOADING false 1`] = `
                                               asd
                                             </h4>
                                           </Component>
-                                          <Component>
+                                          <Component
+                                            className="text-ellipisis"
+                                          >
                                             <h6
-                                              className="subtitle is-6  "
+                                              className="subtitle is-6 text-ellipisis "
                                               id=""
                                             >
                                               Pete's Proptech World Ltd
diff --git a/packages/marketplace/src/components/ui/__tests__/__snapshots__/app-list.tsx.snap b/packages/marketplace/src/components/ui/__tests__/__snapshots__/app-list.tsx.snap
index 873a6b4536..51bcd815fc 100644
--- a/packages/marketplace/src/components/ui/__tests__/__snapshots__/app-list.tsx.snap
+++ b/packages/marketplace/src/components/ui/__tests__/__snapshots__/app-list.tsx.snap
@@ -8,75 +8,77 @@ exports[`AppList should match a snapshot 1`] = `
   <Component>
     Title
   </Component>
-  <Component
-    className="undefined "
-    data-test="app-list-container"
-  >
+  <div>
     <Component
-      key="09043eb8-9e5e-4650-b7f1-f0cb62699027"
+      className="undefined "
+      data-test="app-list-container"
     >
-      <AppCard
-        app={
-          Object {
-            "created": "2020-02-02T10:45:57",
-            "developer": "Pete's Proptech World Ltd",
-            "developerId": "28c9ea52-7f73-4814-9e00-4e3714b8adeb",
-            "homePage": "http://google.com/abc",
-            "iconUri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/d10e790c-2bf2-40ae-9c43-82c1534bde31.png",
-            "id": "09043eb8-9e5e-4650-b7f1-f0cb62699027",
-            "links": Array [
-              Object {
-                "action": "GET",
-                "href": "http://platformdemo.reapit.net/marketplace/apps/09043eb8-9e5e-4650-b7f1-f0cb62699027",
-                "rel": "self",
-              },
-              Object {
-                "action": "GET",
-                "href": "http://platformdemo.reapit.net/marketplace/developers/28c9ea52-7f73-4814-9e00-4e3714b8adeb",
-                "rel": "developer",
-              },
-            ],
-            "name": "test",
-            "summary": "nXXT2zaK807ysWgy8F0WEhIYRP3TgosAtfuiLtQCImoSx0kynxbIF0nkGHU36Oz13kM3DG0Bcsicr8L6eWFKLBg4axlmiOEWcvwHAbBP9LRvoFkCl58k1wjhOExnpaZItEyOT1AXVKv8PE44aMGtVz",
+      <Component
+        key="09043eb8-9e5e-4650-b7f1-f0cb62699027"
+      >
+        <AppCard
+          app={
+            Object {
+              "created": "2020-02-02T10:45:57",
+              "developer": "Pete's Proptech World Ltd",
+              "developerId": "28c9ea52-7f73-4814-9e00-4e3714b8adeb",
+              "homePage": "http://google.com/abc",
+              "iconUri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/d10e790c-2bf2-40ae-9c43-82c1534bde31.png",
+              "id": "09043eb8-9e5e-4650-b7f1-f0cb62699027",
+              "links": Array [
+                Object {
+                  "action": "GET",
+                  "href": "http://platformdemo.reapit.net/marketplace/apps/09043eb8-9e5e-4650-b7f1-f0cb62699027",
+                  "rel": "self",
+                },
+                Object {
+                  "action": "GET",
+                  "href": "http://platformdemo.reapit.net/marketplace/developers/28c9ea52-7f73-4814-9e00-4e3714b8adeb",
+                  "rel": "developer",
+                },
+              ],
+              "name": "test",
+              "summary": "nXXT2zaK807ysWgy8F0WEhIYRP3TgosAtfuiLtQCImoSx0kynxbIF0nkGHU36Oz13kM3DG0Bcsicr8L6eWFKLBg4axlmiOEWcvwHAbBP9LRvoFkCl58k1wjhOExnpaZItEyOT1AXVKv8PE44aMGtVz",
+            }
           }
-        }
-        onClick={[Function]}
-        onSettingsClick={[Function]}
-      />
-    </Component>
-    <Component
-      key="261da083-cee2-4f5c-a18f-8f9375f1f5af"
-    >
-      <AppCard
-        app={
-          Object {
-            "created": "2020-02-02T10:45:57",
-            "developer": "Pete's Proptech World Ltd",
-            "developerId": "28c9ea52-7f73-4814-9e00-4e3714b8adeb",
-            "homePage": "http://www.contoso.com/path",
-            "iconUri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/1d38c5ec-e3c0-4138-9fe0-e77bce4034d1.octet-stream",
-            "id": "261da083-cee2-4f5c-a18f-8f9375f1f5af",
-            "links": Array [
-              Object {
-                "action": "GET",
-                "href": "http://platformdemo.reapit.net/marketplace/apps/261da083-cee2-4f5c-a18f-8f9375f1f5af",
-                "rel": "self",
-              },
-              Object {
-                "action": "GET",
-                "href": "http://platformdemo.reapit.net/marketplace/developers/28c9ea52-7f73-4814-9e00-4e3714b8adeb",
-                "rel": "developer",
-              },
-            ],
-            "name": "asd",
-            "summary": "asdQiiAJTmXGxPin7pwUiCsepZWXz1EJS71eGlvgPKH4hpE6J8DRDpzP2kDdOwpQPr4aHCCwWwxBJwzARLa7wMpJh5J61GhmQjLfKZkcDd47L9WEfQYVYAj0DTPJP0BuUMAAg2",
+          onClick={[Function]}
+          onSettingsClick={[Function]}
+        />
+      </Component>
+      <Component
+        key="261da083-cee2-4f5c-a18f-8f9375f1f5af"
+      >
+        <AppCard
+          app={
+            Object {
+              "created": "2020-02-02T10:45:57",
+              "developer": "Pete's Proptech World Ltd",
+              "developerId": "28c9ea52-7f73-4814-9e00-4e3714b8adeb",
+              "homePage": "http://www.contoso.com/path",
+              "iconUri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/1d38c5ec-e3c0-4138-9fe0-e77bce4034d1.octet-stream",
+              "id": "261da083-cee2-4f5c-a18f-8f9375f1f5af",
+              "links": Array [
+                Object {
+                  "action": "GET",
+                  "href": "http://platformdemo.reapit.net/marketplace/apps/261da083-cee2-4f5c-a18f-8f9375f1f5af",
+                  "rel": "self",
+                },
+                Object {
+                  "action": "GET",
+                  "href": "http://platformdemo.reapit.net/marketplace/developers/28c9ea52-7f73-4814-9e00-4e3714b8adeb",
+                  "rel": "developer",
+                },
+              ],
+              "name": "asd",
+              "summary": "asdQiiAJTmXGxPin7pwUiCsepZWXz1EJS71eGlvgPKH4hpE6J8DRDpzP2kDdOwpQPr4aHCCwWwxBJwzARLa7wMpJh5J61GhmQjLfKZkcDd47L9WEfQYVYAj0DTPJP0BuUMAAg2",
+            }
           }
-        }
-        onClick={[Function]}
-        onSettingsClick={[Function]}
-      />
+          onClick={[Function]}
+          onSettingsClick={[Function]}
+        />
+      </Component>
     </Component>
-  </Component>
+  </div>
   <Component>
     <Component
       onChange={[MockFunction]}
@@ -96,75 +98,77 @@ exports[`AppList should match a snapshot when use empty infoType 1`] = `
   <Component>
     Title
   </Component>
-  <Component
-    className="undefined "
-    data-test="app-list-container"
-  >
+  <div>
     <Component
-      key="09043eb8-9e5e-4650-b7f1-f0cb62699027"
+      className="undefined "
+      data-test="app-list-container"
     >
-      <AppCard
-        app={
-          Object {
-            "created": "2020-02-02T10:45:57",
-            "developer": "Pete's Proptech World Ltd",
-            "developerId": "28c9ea52-7f73-4814-9e00-4e3714b8adeb",
-            "homePage": "http://google.com/abc",
-            "iconUri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/d10e790c-2bf2-40ae-9c43-82c1534bde31.png",
-            "id": "09043eb8-9e5e-4650-b7f1-f0cb62699027",
-            "links": Array [
-              Object {
-                "action": "GET",
-                "href": "http://platformdemo.reapit.net/marketplace/apps/09043eb8-9e5e-4650-b7f1-f0cb62699027",
-                "rel": "self",
-              },
-              Object {
-                "action": "GET",
-                "href": "http://platformdemo.reapit.net/marketplace/developers/28c9ea52-7f73-4814-9e00-4e3714b8adeb",
-                "rel": "developer",
-              },
-            ],
-            "name": "test",
-            "summary": "nXXT2zaK807ysWgy8F0WEhIYRP3TgosAtfuiLtQCImoSx0kynxbIF0nkGHU36Oz13kM3DG0Bcsicr8L6eWFKLBg4axlmiOEWcvwHAbBP9LRvoFkCl58k1wjhOExnpaZItEyOT1AXVKv8PE44aMGtVz",
+      <Component
+        key="09043eb8-9e5e-4650-b7f1-f0cb62699027"
+      >
+        <AppCard
+          app={
+            Object {
+              "created": "2020-02-02T10:45:57",
+              "developer": "Pete's Proptech World Ltd",
+              "developerId": "28c9ea52-7f73-4814-9e00-4e3714b8adeb",
+              "homePage": "http://google.com/abc",
+              "iconUri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/d10e790c-2bf2-40ae-9c43-82c1534bde31.png",
+              "id": "09043eb8-9e5e-4650-b7f1-f0cb62699027",
+              "links": Array [
+                Object {
+                  "action": "GET",
+                  "href": "http://platformdemo.reapit.net/marketplace/apps/09043eb8-9e5e-4650-b7f1-f0cb62699027",
+                  "rel": "self",
+                },
+                Object {
+                  "action": "GET",
+                  "href": "http://platformdemo.reapit.net/marketplace/developers/28c9ea52-7f73-4814-9e00-4e3714b8adeb",
+                  "rel": "developer",
+                },
+              ],
+              "name": "test",
+              "summary": "nXXT2zaK807ysWgy8F0WEhIYRP3TgosAtfuiLtQCImoSx0kynxbIF0nkGHU36Oz13kM3DG0Bcsicr8L6eWFKLBg4axlmiOEWcvwHAbBP9LRvoFkCl58k1wjhOExnpaZItEyOT1AXVKv8PE44aMGtVz",
+            }
           }
-        }
-        onClick={[Function]}
-        onSettingsClick={[Function]}
-      />
-    </Component>
-    <Component
-      key="261da083-cee2-4f5c-a18f-8f9375f1f5af"
-    >
-      <AppCard
-        app={
-          Object {
-            "created": "2020-02-02T10:45:57",
-            "developer": "Pete's Proptech World Ltd",
-            "developerId": "28c9ea52-7f73-4814-9e00-4e3714b8adeb",
-            "homePage": "http://www.contoso.com/path",
-            "iconUri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/1d38c5ec-e3c0-4138-9fe0-e77bce4034d1.octet-stream",
-            "id": "261da083-cee2-4f5c-a18f-8f9375f1f5af",
-            "links": Array [
-              Object {
-                "action": "GET",
-                "href": "http://platformdemo.reapit.net/marketplace/apps/261da083-cee2-4f5c-a18f-8f9375f1f5af",
-                "rel": "self",
-              },
-              Object {
-                "action": "GET",
-                "href": "http://platformdemo.reapit.net/marketplace/developers/28c9ea52-7f73-4814-9e00-4e3714b8adeb",
-                "rel": "developer",
-              },
-            ],
-            "name": "asd",
-            "summary": "asdQiiAJTmXGxPin7pwUiCsepZWXz1EJS71eGlvgPKH4hpE6J8DRDpzP2kDdOwpQPr4aHCCwWwxBJwzARLa7wMpJh5J61GhmQjLfKZkcDd47L9WEfQYVYAj0DTPJP0BuUMAAg2",
+          onClick={[Function]}
+          onSettingsClick={[Function]}
+        />
+      </Component>
+      <Component
+        key="261da083-cee2-4f5c-a18f-8f9375f1f5af"
+      >
+        <AppCard
+          app={
+            Object {
+              "created": "2020-02-02T10:45:57",
+              "developer": "Pete's Proptech World Ltd",
+              "developerId": "28c9ea52-7f73-4814-9e00-4e3714b8adeb",
+              "homePage": "http://www.contoso.com/path",
+              "iconUri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/1d38c5ec-e3c0-4138-9fe0-e77bce4034d1.octet-stream",
+              "id": "261da083-cee2-4f5c-a18f-8f9375f1f5af",
+              "links": Array [
+                Object {
+                  "action": "GET",
+                  "href": "http://platformdemo.reapit.net/marketplace/apps/261da083-cee2-4f5c-a18f-8f9375f1f5af",
+                  "rel": "self",
+                },
+                Object {
+                  "action": "GET",
+                  "href": "http://platformdemo.reapit.net/marketplace/developers/28c9ea52-7f73-4814-9e00-4e3714b8adeb",
+                  "rel": "developer",
+                },
+              ],
+              "name": "asd",
+              "summary": "asdQiiAJTmXGxPin7pwUiCsepZWXz1EJS71eGlvgPKH4hpE6J8DRDpzP2kDdOwpQPr4aHCCwWwxBJwzARLa7wMpJh5J61GhmQjLfKZkcDd47L9WEfQYVYAj0DTPJP0BuUMAAg2",
+            }
           }
-        }
-        onClick={[Function]}
-        onSettingsClick={[Function]}
-      />
+          onClick={[Function]}
+          onSettingsClick={[Function]}
+        />
+      </Component>
     </Component>
-  </Component>
+  </div>
   <Component>
     <Component
       onChange={[MockFunction]}
@@ -193,75 +197,77 @@ exports[`AppList should match a snapshot when use has header button 1`] = `
       Create new app
     </Component>
   </div>
-  <Component
-    className="undefined "
-    data-test="app-list-container"
-  >
+  <div>
     <Component
-      key="09043eb8-9e5e-4650-b7f1-f0cb62699027"
+      className="undefined "
+      data-test="app-list-container"
     >
-      <AppCard
-        app={
-          Object {
-            "created": "2020-02-02T10:45:57",
-            "developer": "Pete's Proptech World Ltd",
-            "developerId": "28c9ea52-7f73-4814-9e00-4e3714b8adeb",
-            "homePage": "http://google.com/abc",
-            "iconUri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/d10e790c-2bf2-40ae-9c43-82c1534bde31.png",
-            "id": "09043eb8-9e5e-4650-b7f1-f0cb62699027",
-            "links": Array [
-              Object {
-                "action": "GET",
-                "href": "http://platformdemo.reapit.net/marketplace/apps/09043eb8-9e5e-4650-b7f1-f0cb62699027",
-                "rel": "self",
-              },
-              Object {
-                "action": "GET",
-                "href": "http://platformdemo.reapit.net/marketplace/developers/28c9ea52-7f73-4814-9e00-4e3714b8adeb",
-                "rel": "developer",
-              },
-            ],
-            "name": "test",
-            "summary": "nXXT2zaK807ysWgy8F0WEhIYRP3TgosAtfuiLtQCImoSx0kynxbIF0nkGHU36Oz13kM3DG0Bcsicr8L6eWFKLBg4axlmiOEWcvwHAbBP9LRvoFkCl58k1wjhOExnpaZItEyOT1AXVKv8PE44aMGtVz",
+      <Component
+        key="09043eb8-9e5e-4650-b7f1-f0cb62699027"
+      >
+        <AppCard
+          app={
+            Object {
+              "created": "2020-02-02T10:45:57",
+              "developer": "Pete's Proptech World Ltd",
+              "developerId": "28c9ea52-7f73-4814-9e00-4e3714b8adeb",
+              "homePage": "http://google.com/abc",
+              "iconUri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/d10e790c-2bf2-40ae-9c43-82c1534bde31.png",
+              "id": "09043eb8-9e5e-4650-b7f1-f0cb62699027",
+              "links": Array [
+                Object {
+                  "action": "GET",
+                  "href": "http://platformdemo.reapit.net/marketplace/apps/09043eb8-9e5e-4650-b7f1-f0cb62699027",
+                  "rel": "self",
+                },
+                Object {
+                  "action": "GET",
+                  "href": "http://platformdemo.reapit.net/marketplace/developers/28c9ea52-7f73-4814-9e00-4e3714b8adeb",
+                  "rel": "developer",
+                },
+              ],
+              "name": "test",
+              "summary": "nXXT2zaK807ysWgy8F0WEhIYRP3TgosAtfuiLtQCImoSx0kynxbIF0nkGHU36Oz13kM3DG0Bcsicr8L6eWFKLBg4axlmiOEWcvwHAbBP9LRvoFkCl58k1wjhOExnpaZItEyOT1AXVKv8PE44aMGtVz",
+            }
           }
-        }
-        onClick={[Function]}
-        onSettingsClick={[Function]}
-      />
-    </Component>
-    <Component
-      key="261da083-cee2-4f5c-a18f-8f9375f1f5af"
-    >
-      <AppCard
-        app={
-          Object {
-            "created": "2020-02-02T10:45:57",
-            "developer": "Pete's Proptech World Ltd",
-            "developerId": "28c9ea52-7f73-4814-9e00-4e3714b8adeb",
-            "homePage": "http://www.contoso.com/path",
-            "iconUri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/1d38c5ec-e3c0-4138-9fe0-e77bce4034d1.octet-stream",
-            "id": "261da083-cee2-4f5c-a18f-8f9375f1f5af",
-            "links": Array [
-              Object {
-                "action": "GET",
-                "href": "http://platformdemo.reapit.net/marketplace/apps/261da083-cee2-4f5c-a18f-8f9375f1f5af",
-                "rel": "self",
-              },
-              Object {
-                "action": "GET",
-                "href": "http://platformdemo.reapit.net/marketplace/developers/28c9ea52-7f73-4814-9e00-4e3714b8adeb",
-                "rel": "developer",
-              },
-            ],
-            "name": "asd",
-            "summary": "asdQiiAJTmXGxPin7pwUiCsepZWXz1EJS71eGlvgPKH4hpE6J8DRDpzP2kDdOwpQPr4aHCCwWwxBJwzARLa7wMpJh5J61GhmQjLfKZkcDd47L9WEfQYVYAj0DTPJP0BuUMAAg2",
+          onClick={[Function]}
+          onSettingsClick={[Function]}
+        />
+      </Component>
+      <Component
+        key="261da083-cee2-4f5c-a18f-8f9375f1f5af"
+      >
+        <AppCard
+          app={
+            Object {
+              "created": "2020-02-02T10:45:57",
+              "developer": "Pete's Proptech World Ltd",
+              "developerId": "28c9ea52-7f73-4814-9e00-4e3714b8adeb",
+              "homePage": "http://www.contoso.com/path",
+              "iconUri": "https://reapit-app-store-app-media.s3.eu-west-2.amazonaws.com/1d38c5ec-e3c0-4138-9fe0-e77bce4034d1.octet-stream",
+              "id": "261da083-cee2-4f5c-a18f-8f9375f1f5af",
+              "links": Array [
+                Object {
+                  "action": "GET",
+                  "href": "http://platformdemo.reapit.net/marketplace/apps/261da083-cee2-4f5c-a18f-8f9375f1f5af",
+                  "rel": "self",
+                },
+                Object {
+                  "action": "GET",
+                  "href": "http://platformdemo.reapit.net/marketplace/developers/28c9ea52-7f73-4814-9e00-4e3714b8adeb",
+                  "rel": "developer",
+                },
+              ],
+              "name": "asd",
+              "summary": "asdQiiAJTmXGxPin7pwUiCsepZWXz1EJS71eGlvgPKH4hpE6J8DRDpzP2kDdOwpQPr4aHCCwWwxBJwzARLa7wMpJh5J61GhmQjLfKZkcDd47L9WEfQYVYAj0DTPJP0BuUMAAg2",
+            }
           }
-        }
-        onClick={[Function]}
-        onSettingsClick={[Function]}
-      />
+          onClick={[Function]}
+          onSettingsClick={[Function]}
+        />
+      </Component>
     </Component>
-  </Component>
+  </div>
   <Component>
     <Component
       onChange={[MockFunction]}
diff --git a/packages/marketplace/src/components/ui/app-list.tsx b/packages/marketplace/src/components/ui/app-list.tsx
index 27b75c02d2..1f55af8b50 100644
--- a/packages/marketplace/src/components/ui/app-list.tsx
+++ b/packages/marketplace/src/components/ui/app-list.tsx
@@ -74,34 +74,36 @@ export const AppList: React.FunctionComponent<AppListProps> = ({
             : 'We are unable to find any Apps that match your search criteria. Please try again.'}
         </Helper>
       ) : (
-        <GridFourCol
-          className={`${styles.flexGrow} ${loading ? styles.contentIsLoading : ''}`}
-          data-test="app-list-container"
-        >
-          {list.map(app => (
-            <WrapperContainer key={app.id}>
-              <AppCard
-                app={app}
-                onClick={
-                  onCardClick
-                    ? (event: React.MouseEvent) => {
-                        event.stopPropagation()
-                        onCardClick(app)
-                      }
-                    : undefined
-                }
-                onSettingsClick={
-                  onSettingsClick
-                    ? (event: React.MouseEvent) => {
-                        event.stopPropagation()
-                        onSettingsClick(app)
-                      }
-                    : undefined
-                }
-              />
-            </WrapperContainer>
-          ))}
-        </GridFourCol>
+        <div>
+          <GridFourCol
+            className={`${styles.flexGrow} ${loading ? styles.contentIsLoading : ''}`}
+            data-test="app-list-container"
+          >
+            {list.map(app => (
+              <WrapperContainer key={app.id}>
+                <AppCard
+                  app={app}
+                  onClick={
+                    onCardClick
+                      ? (event: React.MouseEvent) => {
+                          event.stopPropagation()
+                          onCardClick(app)
+                        }
+                      : undefined
+                  }
+                  onSettingsClick={
+                    onSettingsClick
+                      ? (event: React.MouseEvent) => {
+                          event.stopPropagation()
+                          onSettingsClick(app)
+                        }
+                      : undefined
+                  }
+                />
+              </WrapperContainer>
+            ))}
+          </GridFourCol>
+        </div>
       )}
 
       {loading && <Loader body />}