diff --git a/module/fid_bbi/src/fid_bbi/View/Helper/Root/Flashmessages.php b/module/fid_bbi/src/fid_bbi/View/Helper/Root/Flashmessages.php
index dff69ef11abe39fb8d8c5577632ee98d1452f862..7629aa71ffee7e110898872808cf8bd3ad69eeff 100644
--- a/module/fid_bbi/src/fid_bbi/View/Helper/Root/Flashmessages.php
+++ b/module/fid_bbi/src/fid_bbi/View/Helper/Root/Flashmessages.php
@@ -63,13 +63,13 @@ class Flashmessages extends \VuFind\View\Helper\Bootstrap3\Flashmessages
             );
 
             foreach (array_unique($messages, SORT_REGULAR) as $msg) {
-                $html .= '<p class="' . $this->getClassForNamespace($ns) . '"';
+                $html .= '<div class="' . $this->getClassForNamespace($ns) . '"';
                 if (isset($msg['dataset'])) {
                     foreach ($msg['dataset'] as $attr => $value) {
                         $html .= ' data-' . $attr . '="' . htmlspecialchars($value) . '"';
                     }
                 }
-                $html .= '>';
+                $html .= ' role="alert">';
 
                 // BBI-specific
                 // Add icon based on namespace
@@ -102,7 +102,7 @@ class Flashmessages extends \VuFind\View\Helper\Bootstrap3\Flashmessages
                     $html .= $transEsc($msg);
                 }
 
-                $html .= '</p>';
+                $html .= '</div>';
             }
 
             $this->fm->clearMessages($ns);
diff --git a/themes/fid_bbi/languages/de.ini b/themes/fid_bbi/languages/de.ini
index 050805b67422f2c9db3c7f71284effa7bcbf1517..f8f3f28c46408a9f5a878df6c0abccc100c4acb1 100644
--- a/themes/fid_bbi/languages/de.ini
+++ b/themes/fid_bbi/languages/de.ini
@@ -4,6 +4,7 @@ Active Filters = Aktive Filter
 Add filter = Filter hinzufügen
 add_filter_not = Filter hinzufügen: NICHT %%text%%
 Add to Book Bag = Zur Merkliste hinzufügen
+Remove from Book Bag = Aus der Merkliste entfernen
 Add to favorites = Zu Favoriten hinzufügen
 Back = Zurück
 BBI Blog = BBI-Blog
diff --git a/themes/fid_bbi/templates/cart/cart.phtml b/themes/fid_bbi/templates/cart/cart.phtml
index 7c45b349dd64048d66f68aa9bbc9e6d6bcd75db5..b49b5f8255f4a3213b825779004a8f99369efc92 100644
--- a/themes/fid_bbi/templates/cart/cart.phtml
+++ b/themes/fid_bbi/templates/cart/cart.phtml
@@ -79,12 +79,6 @@ $this->headTitle($this->translate('Book Bag'));
         </ul>
       </div>
 
-      <?php
-      // TODO: Empty button commented out; it would lead to a second button
-      // column, and since the same result can be achieved by clicking
-      // "Select page" and then "Delete", it is not really needed.
-
-      /*
       <div class="btn-group">
         <button type="submit" class="button -small dropdown-toggle" name="empty" data-toggle="dropdown" id="cart-empty-label" value="1">
           <!-- TODO: Icon? -->
@@ -108,8 +102,6 @@ $this->headTitle($this->translate('Book Bag'));
           </li>
         </ul>
       </div>
-      */
-      ?>
     </div>
   <?php endif; ?>