diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php
index f858fb1ce..fd62d6b8c 100644
--- a/views/bootstrap/class.Bootstrap.php
+++ b/views/bootstrap/class.Bootstrap.php
@@ -627,6 +627,18 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 		echo $content;
 	} /* }}} */
 
+	protected function showPaneHeader($name, $title, $isactive) { /* {{{ */
+		echo '<li class="nav-item '.($isactive ? 'active' : '').'"><a class="nav-link '.($isactive ? 'active' : '').'" data-target="#'.$name.'" data-toggle="tab" role="tab">'.$title.'</a></li>'."\n";
+	} /* }}} */
+
+	protected function showStartPaneContent($name, $isactive) { /* {{{ */
+		echo '<div class="tab-pane'.($isactive ? ' active' : '').'" id="'.$name.'" role="tabpanel">';
+	} /* }}} */
+
+	protected function showEndPaneContent($name, $currentab) { /* {{{ */
+		echo '</div>';
+	} /* }}} */
+
 	private function folderNavigationBar($folder) { /* {{{ */
 		$dms = $this->params['dms'];
 		$accessobject = $this->params['accessobject'];
@@ -1257,7 +1269,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 			foreach($config['attributes'] as $attrname=>$attrval)
 				$content .= ' '.$attrname.'="'.$attrval.'"';
 		}
-		$content .= ">".$config['title']."…</a>\n";
+		$content .= ">".$config['title']."</a>\n";
 		return $content;
 	} /* }}} */
 
@@ -1272,7 +1284,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
 	 */
 	function getModalBox($config) { /* {{{ */
 		$content = '
-<div class="modal hide" id="'.$config['id'].'" tabindex="-1" role="dialog" aria-labelledby="'.$config['id'].'Label" aria-hidden="true">
+<div class="modal modal-wide hide" id="'.$config['id'].'" tabindex="-1" role="dialog" aria-labelledby="'.$config['id'].'Label" aria-hidden="true">
   <div class="modal-header">
     <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
     <h3 id="'.$config['id'].'Label">'.$config['title'].'</h3>
@@ -1444,7 +1456,7 @@ $(document).ready(function() {
 				array(
 					'target' => 'docChooser'.$formid,
 					'remote' => "../out/out.DocumentChooser.php?form=".$formid."&folderid=".$this->params['dms']->getRootFolder()->getId(),
-					'title' => getMLText('document')
+					'title' => getMLText('document').'…'
 				));
 		$content .= "</div>\n";
 		if(!$skiptree)
@@ -1508,7 +1520,7 @@ function folderSelected<?php echo $formid ?>(id, name) {
 				array(
 					'target' => 'folderChooser'.$formid,
 					'remote' => "../out/out.FolderChooser.php?form=".$formid."&mode=".$accessMode."&exclude=".$exclude,
-					'title' => getMLText('folder')
+					'title' => getMLText('folder').'…'
 				));
 		}
 		$content .= "</div>\n";
@@ -1580,7 +1592,7 @@ $(document).ready(function() {
 			array(
 				'target' => 'keywordChooser',
 				'remote' => "../out/out.KeywordChooser.php?target=".$formName,
-				'title' => getMLText('keywords')
+				'title' => getMLText('keywords').'…'
 			));
 		$content .= '
 			</div>
@@ -1831,7 +1843,7 @@ $(document).ready(function() {
 			array(
 				'target' => 'dropfolderChooser',
 				'remote' => "../out/out.DropFolderChooser.php?form=".$formName."&dropfolderfile=".urlencode($dropfolderfile)."&showfolders=".$showfolders,
-				'title' => ($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file"))
+				'title' => ($showfolders ? getMLText("choose_target_folder"): getMLText("choose_target_file")).'…'
 			));
 		$content .= "</div>\n";
 		$content .= $this->getModalBox(