diff --git a/composer.json b/composer.json
index 4660d185b092d6e3b18fb1cf59c2d2d388782131..ae4649c5bf40d0be26bfae06fa3c1d14dad82dc9 100644
--- a/composer.json
+++ b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "t3o/ter",
   "description": "Website for TYPO3 Extension Repository",
-  "minimum-stability": "stable",
+  "minimum-stability": "dev",
   "authors": [
     {
       "name": "t3o team",
@@ -27,7 +27,7 @@
     "helhum/typo3-console": "^4.5",
     "dmitryd/typo3-realurl": "^2.2",
     "apache-solr-for-typo3/solr": "^7.0",
-    "t3o/t3olayout": "^1.0",
+    "t3o/t3olayout": "^2.0",
     "nikic/php-parser": "^3.1"
   },
   "config": {
diff --git a/composer.lock b/composer.lock
index 421a57e68008703dea4f5353ef9e6bfd6a2ea909..a8b4274250ba626dd7639776d8b552ce8450c7be 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "4929f989aa53adf1f1cca6a2c0557cb3",
+    "content-hash": "83639c916b961cc3aa6b2d81095e9b83",
     "packages": [
         {
             "name": "apache-solr-for-typo3/solr",
@@ -715,6 +715,40 @@
             ],
             "time": "2014-09-09T13:34:57+00:00"
         },
+        {
+            "name": "gridelementsteam/gridelements",
+            "version": "dev-master",
+            "source": {
+                "type": "git",
+                "url": "https://git.typo3.org/TYPO3CMS/Extensions/gridelements.git",
+                "reference": "e4ca6909c31ac02296a6b28f5c27a8d837538a8a"
+            },
+            "require": {
+                "typo3/cms-core": "~8.0"
+            },
+            "replace": {
+                "gridelements": "self.version",
+                "typo3-ter/gridelements": "self.version"
+            },
+            "type": "typo3-cms-extension",
+            "autoload": {
+                "psr-4": {
+                    "GridElementsTeam\\Gridelements\\": "Classes/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "description": "This extension integrates the grid layout concept to regular content elements.",
+            "homepage": "https://forge.typo3.org/projects/extension-gridelements2",
+            "keywords": [
+                "Gridelements",
+                "TYPO3 CMS",
+                "grids"
+            ],
+            "time": "2017-09-21T07:38:47+00:00"
+        },
         {
             "name": "guzzlehttp/guzzle",
             "version": "6.3.0",
@@ -1624,13 +1658,14 @@
         },
         {
             "name": "t3o/t3olayout",
-            "version": "1.0.10",
+            "version": "2.0.0",
             "source": {
                 "type": "git",
                 "url": "https://git-t3o.typo3.org/t3o/t3olayout.git",
-                "reference": "2939bfe9ba8316730365fcd5fe78f2542960454a"
+                "reference": "12fc4cdb182d40653b4940c29a9be45285561534"
             },
             "require": {
+                "gridelementsteam/gridelements": "dev-master",
                 "typo3-ter/ig-ldap-sso-auth": "^3.2"
             },
             "type": "typo3-cms-extension",
@@ -1647,7 +1682,7 @@
             "keywords": [
                 "TYPO3 CMS"
             ],
-            "time": "2017-09-18T09:57:57+00:00"
+            "time": "2017-12-08T12:47:15+00:00"
         },
         {
             "name": "typo3-ter/ig-ldap-sso-auth",
@@ -2088,7 +2123,7 @@
     ],
     "packages-dev": [],
     "aliases": [],
-    "minimum-stability": "stable",
+    "minimum-stability": "dev",
     "stability-flags": [],
     "prefer-stable": false,
     "prefer-lowest": false,
diff --git a/html/typo3conf/ext/ter_fe2/Resources/Private/Partials/InstallationHowTo.html b/html/typo3conf/ext/ter_fe2/Resources/Private/Partials/InstallationHowTo.html
index 67ebe00e995435bf867e102bcb32e6a5202d0cf2..99669cdba81473a2f0751b72f4f9739abff1d301 100644
--- a/html/typo3conf/ext/ter_fe2/Resources/Private/Partials/InstallationHowTo.html
+++ b/html/typo3conf/ext/ter_fe2/Resources/Private/Partials/InstallationHowTo.html
@@ -9,7 +9,7 @@
             </h5>
         </div>
         <div id="install-zip" class="collapse show" role="tabpanel" aria-labelledby="headingOne">
-            <div class="card-block">
+            <div class="card-body">
                 <ol>
                     <li>
                         <f:link.action controller="Extension" action="download" arguments="{extension : extension, versionString : extension.lastVersion.versionString, format : 'zip'}">
@@ -43,7 +43,7 @@
                 </h5>
             </div>
             <div id="install-composer" class="collapse" role="tabpanel" aria-labelledby="headingTwo">
-                <div class="card-block">
+                <div class="card-body">
                     <ol>
                         <li>
                             Go to your folder where the root composer.json file is located
@@ -66,7 +66,7 @@
             </h5>
         </div>
         <div id="install-t3x" class="collapse" role="tabpanel" aria-labelledby="headingThree">
-            <div class="card-block">
+            <div class="card-body">
                 <ol>
                     <li>
                         <f:link.action controller="Extension" action="download" arguments="{extension : extension, versionString : extension.lastVersion.versionString, format : 't3x'}">
diff --git a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTags.html b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTags.html
index b036d7485f5597cfa7e135b23ccdc41bffed9143..74bde75240a528bfdd7e91fa6dbd6dec6330afee 100644
--- a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTags.html
+++ b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTags.html
@@ -6,7 +6,7 @@
 <div class="card-header">
     <span class="facet-label">{facet.label}</span>
 </div>
-<div class="card-block">
+<div class="card-body">
     <div class="facet-option-list facet-type-options fluidfacet" data-facet-name="{facet.name}" data-facet-label="{facet.label}">
         <f:for each="{facet.options}" as="option" iteration="iteration">
             <a class="btn btn-outline-{facet.configuration.itemClass} btn-sm mb-1 mr-1 facet solr-ajaxified" href="{s:uri.facet.addFacetItem(facet: facet, facetItem: option)}">
diff --git a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTypo3.html b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTypo3.html
index 1ccd2d221cfb2ecebc8ee1a0c582c0450bfaf38b..7fe45cae4a5062a88bc558058914886ac6e68e38 100644
--- a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTypo3.html
+++ b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Facets/OptionsTypo3.html
@@ -5,7 +5,7 @@
 <div class="card-header">
     <span class="facet-label">{facet.label}</span>
 </div>
-<div class="card-block">
+<div class="card-body">
     <div class="facet-option-list facet-type-options fluidfacet" data-facet-name="{facet.name}" data-facet-label="{facet.label}">
         <f:for each="{facet.options}" as="option" iteration="iteration">
             <a class="btn btn-outline-{facet.configuration.itemClass} btn-sm mb-1 facet solr-ajaxified" href="{s:uri.facet.addFacetItem(facet: facet, facetItem: option)}">
diff --git a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Document.html b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Document.html
index 32422159bddbb737efeb178f3d9dcc35a5b0ac33..088f397ca58123ca1ebd009961747885bc82390e 100644
--- a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Document.html
+++ b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Document.html
@@ -14,7 +14,7 @@
                 <s:translate key="sponsored" />
             </div>
         </f:if>
-        <div class="card-block">
+        <div class="card-body">
             <div class="align-items-center">
                 <h3 class="card-title">
                     <f:if condition="{document.extensionIcon_stringS}">
@@ -52,11 +52,9 @@
         </div>
         <f:if condition="{document.insecure_boolS}">
             <f:else>
-                <div class="">
-                    <a class="btn btn-outline-primary btn-block" href="{document.extensionDownloadZipUrl_stringS}">
-                        <i class="fa fa-download"></i> Download version {document.extensionVersion_stringS} as ZIP
-                    </a>
-                </div>
+                <a class="btn btn-outline-primary btn-block mb-0" href="{document.extensionDownloadZipUrl_stringS}">
+                    <i class="fa fa-download"></i> Download version {document.extensionVersion_stringS} as ZIP
+                </a>
             </f:else>
         </f:if>
     </li>
diff --git a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Facets.html b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Facets.html
index d0abe866f3fbd1e9b3d984ffd021db452dbcb9a6..8900165686f3eed4714020695e421c45d0f36a9f 100644
--- a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Facets.html
+++ b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Result/Facets.html
@@ -10,7 +10,7 @@
                     <div class="card-header">
                         <s:translate key="faceting_resultsNarrowedBy">Used facets</s:translate>
                     </div>
-                    <div class="card-block">
+                    <div class="card-body">
                         <ul class="facets list-unstyled">
                             <f:for each="{resultSet.facets.used}" as="facet">
                                 <f:for each="{facet.allFacetItems.selected}" as="item">
diff --git a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Search/Form.html b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Search/Form.html
index f4994a2c76e93e3607d2a7e0edc0aedc942ab4e3..7bb46e6ddf70593ba945bb319a534319e8116e93 100644
--- a/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Search/Form.html
+++ b/html/typo3conf/ext/ter_layout/Resources/Private/Partials/Solr/Search/Form.html
@@ -12,7 +12,7 @@
                 <div class="input-group input-group-lg">
                     <input type="text" class="form-control" placeholder="Search for extensions, tags, author..." name="tx_solr[q]" value="{q}">
                     <span class="input-group-btn">
-                    <button type="submit" class="btn btn-primary" type="button">
+                    <button type="submit" class="btn btn-primary mb-0 mt-0" type="button">
                         <s:translate key="submit" default="Search" />
                     </button>
                 </span>