diff --git a/src/main/java/sirius/pasta/tagliatelle/Tagliatelle.java b/src/main/java/sirius/pasta/tagliatelle/Tagliatelle.java
index f94328353..a410f6646 100644
--- a/src/main/java/sirius/pasta/tagliatelle/Tagliatelle.java
+++ b/src/main/java/sirius/pasta/tagliatelle/Tagliatelle.java
@@ -94,20 +94,32 @@ public MultiMap<String, String> getTagLibTags() {
      */
     public List<TemplateExtension> getExtensions(String target) {
         synchronized (extensions) {
-            List<TemplateExtension> result = extensions.get(target);
-            if (result == null) {
-                // As we might re-enter this method while compiling templates in "loadExtensions" we provide a
-                // placeholder value here to avoid infinite recursions. (Under normal circumstances, this shouldn't
-                // happen anyway, as cyclic extensions make no sense at all).
-                extensions.put(target, new ArrayList<>());
-
-                // Load and fill the result list. Note that we cannot use HashMap.computeIfAbsent here, as
-                // loadExtensions itself compiles templates which might end up calling this method leading
-                // to a ConcurrentModificationException...
-                result = loadExtensions(target);
-                extensions.put(target, result);
+            try {
+                List<TemplateExtension> result = extensions.get(target);
+                if (result == null) {
+                    // As we might re-enter this method while compiling templates in "loadExtensions" we provide a
+                    // placeholder value here to avoid infinite recursions. (Under normal circumstances, this shouldn't
+                    // happen anyway, as cyclic extensions make no sense at all).
+                    extensions.put(target, new ArrayList<>());
+
+                    // Load and fill the result list. Note that we cannot use HashMap.computeIfAbsent here, as
+                    // loadExtensions itself compiles templates which might end up calling this method leading
+                    // to a ConcurrentModificationException...
+                    result = loadExtensions(target);
+                    extensions.put(target, result);
+                }
+                return Collections.unmodifiableList(result);
+            } catch (Exception exception) {
+                // If an error occurs while compiling the extensions, we remove our empty placeholder in debug
+                // environments, as it is very likely that the developer will fix the template and attempt to
+                // reload the page. If we didn't clear the extension, the page will simply show up empty.
+                // Note that if this happens in prod environments, we keep the empty list so that the same error
+                // only get reported once...
+                if (Sirius.isDev()) {
+                    extensions.remove(target);
+                }
+                throw exception;
             }
-            return Collections.unmodifiableList(result);
         }
     }
 
@@ -126,7 +138,7 @@ private List<TemplateExtension> loadExtensions(String target) {
     private TemplateExtension resolveToTemplateExtension(String path) {
         try {
             Optional<Template> template = resolve("/" + path);
-            if (!template.isPresent()) {
+            if (template.isEmpty()) {
                 throw Exceptions.handle()
                                 .to(Pasta.LOG)
                                 .withSystemErrorMessage("Cannot resolve extension '%s' into a template!", path)
@@ -234,7 +246,7 @@ public Optional<Template> resolve(String path, @Nullable TemplateCompilationCont
             throws CompileException {
         ensureProperTemplatePath(path);
         Optional<Resource> optionalResource = resources.resolve(path);
-        if (!optionalResource.isPresent()) {
+        if (optionalResource.isEmpty()) {
             return Optional.empty();
         }
 
diff --git a/src/main/resources/default/assets/tycho/styles/buttons.scss b/src/main/resources/default/assets/tycho/styles/buttons.scss
index 238faf69e..098cf87ce 100644
--- a/src/main/resources/default/assets/tycho/styles/buttons.scss
+++ b/src/main/resources/default/assets/tycho/styles/buttons.scss
@@ -21,6 +21,7 @@
   color: #fff !important;
   background-color: $primary-color;
   border-color: $primary-color;
+  text-decoration: none;
 }
 
 .btn-primary {
diff --git a/src/main/resources/default/taglib/t/datacard.html.pasta b/src/main/resources/default/taglib/t/datacard.html.pasta
index f1312b492..40d894297 100644
--- a/src/main/resources/default/taglib/t/datacard.html.pasta
+++ b/src/main/resources/default/taglib/t/datacard.html.pasta
@@ -49,11 +49,17 @@
         </div>
 
         <i:local name="footer" value="@renderToString('footer')"/>
-        <i:if test="isFilled(footer)">
+        <i:local name="footerNavbox" value="@renderToString('footer-navbox')"/>
+        <i:if test="isFilled(footer) || isFilled(footerNavbox)">
             <div class="card-footer">
                 <span class="d-flex flex-row flex-wrap">
                     <i:raw>@footer</i:raw>
                 </span>
+                <i:if test="isFilled(footerNavbox)">
+                    <t:navbox class="mt-2">
+                        <i:raw>@footerNavbox</i:raw>
+                    </t:navbox>
+                </i:if>
             </div>
         </i:if>
     </div>
diff --git a/src/main/resources/default/taglib/t/navbox.html.pasta b/src/main/resources/default/taglib/t/navbox.html.pasta
index 17ecb24c0..bc3cf87ec 100644
--- a/src/main/resources/default/taglib/t/navbox.html.pasta
+++ b/src/main/resources/default/taglib/t/navbox.html.pasta
@@ -1,9 +1,10 @@
 <i:arg type="String" name="labelKey" default="" />
 <i:arg type="String" name="label" default="@i18n(labelKey)" />
+<i:arg type="String" name="class" default="" />
 
 <i:pragma name="description" value="Renders navigation section within the sidebar or another card." />
 
-<ul class="nav flex-column nav-pills">
+<ul class="nav flex-column nav-pills flex-grow-1 @class">
     <i:if test="isFilled(label)">
         <li class="nav-header">@label</li>
     </i:if>
diff --git a/src/main/resources/default/taglib/t/navboxLink.html.pasta b/src/main/resources/default/taglib/t/navboxLink.html.pasta
index 132a2b560..ac07adeb7 100644
--- a/src/main/resources/default/taglib/t/navboxLink.html.pasta
+++ b/src/main/resources/default/taglib/t/navboxLink.html.pasta
@@ -9,7 +9,7 @@
 
 <i:if test="user().hasPermission(permission)">
     <li>
-        <a href="@url" class="nav-link @if(active) {active} d-flex flex-row">
+        <a href="@url" class="card-link nav-link @if(active) {active} d-flex flex-row">
             <i:if test="isFilled(icon)">
                 <span class="nav-link-icon pr-2"><i class="fa @icon"></i></span>
             </i:if>