diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php
index 59e73e0ea..465949567 100644
--- a/views/bootstrap/class.Search.php
+++ b/views/bootstrap/class.Search.php
@@ -113,8 +113,8 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style {
 		$this->contentStart();
 		$this->pageNavigation(getMLText("search_results"), "");
 
-		echo "<div class=\"row-fluid\">\n";
-		echo "<div class=\"span4\">\n";
+		$this->rowStart();
+		$this->columnStart(4);
 //echo "<pre>";print_r($_GET);echo "</pre>";
 ?>
   <ul class="nav nav-tabs" id="searchtab">
@@ -497,8 +497,8 @@ foreach($facets as $facetname=>$values) {
 ?>
 	</div>
 <?php
-		echo "</div>\n";
-		echo "<div class=\"span8\">\n";
+		$this->columnEnd();
+		$this->columnStart(8);
 // Search Result {{{
 		$foldercount = $doccount = 0;
 		if($entries) {
@@ -647,8 +647,8 @@ foreach($facets as $facetname=>$values) {
 			}
 		}
 // }}}
-		echo "</div>";
-		echo "</div>";
+		$this->columnEnd();
+		$this->rowEnd();
 		$this->contentEnd();
 		$this->htmlEndPage();
 	} /* }}} */
diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php
index 27acd6e74..ac6a4f68e 100644
--- a/views/bootstrap/class.ViewFolder.php
+++ b/views/bootstrap/class.ViewFolder.php
@@ -569,7 +569,7 @@ $('body').on('click', '.order-btn', function(ev) {
 			$RightColumnSpan = 8;
 		}
 		if ($LeftColumnSpan > 0) {
-			echo "<div class=\"span".$LeftColumnSpan."\">\n";
+			$this->columnStart($LeftColumnSpan);
 
 			echo $this->callHook('leftContentPre');
 
@@ -594,13 +594,13 @@ $('body').on('click', '.order-btn', function(ev) {
 
 			echo $this->callHook('leftContentPost');
 
-			echo "</div>\n";
+			$this->columnEnd();
 		}
-		echo "<div class=\"span".$RightColumnSpan."\">\n";
+		$this->columnStart($RightColumnSpan);
 
 		if ($enableDropUpload/* && $folder->getAccessMode($user) >= M_READWRITE*/) {
-			echo "<div class=\"row-fluid\">";
-			echo "<div class=\"span8\">";
+			$this->rowStart();
+			$this->columnStart(8);
 		}
 
 //		$this->folderInfos();
@@ -608,15 +608,15 @@ $('body').on('click', '.order-btn', function(ev) {
 	<div class="ajax" data-view="ViewFolder" data-action="folderInfos" data-no-spinner="true" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."\"" : "") ?>></div>
 <?php
 		if ($enableDropUpload/* && $folder->getAccessMode($user) >= M_READWRITE*/) {
-			echo "</div>";
-			echo "<div class=\"span4\">";
+			$this->columnEnd();
+			$this->columnStart(4);
 //			$this->dropUpload();
 ?>
 	<div class="ajax" data-view="ViewFolder" data-action="dropUpload" data-no-spinner="true" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."\"" : "") ?>></div>
 <?php
 
-			echo "</div>";
-			echo "</div>";
+			$this->columnEnd();
+			$this->rowEnd();
 		}
 
 		echo $this->callHook('rightContentPre');
@@ -624,8 +624,8 @@ $('body').on('click', '.order-btn', function(ev) {
 	<div class="ajax" data-view="ViewFolder" data-action="folderList" <?php echo ($folder ? "data-query=\"folderid=".$folder->getID()."&orderby=".$orderby."\"" : "") ?>></div>
 <?php
 		echo $this->callHook('rightContentPost');
-		echo "</div>\n"; // End of right column div
-		echo "</div>\n"; // End of div around left and right column
+		$this->columnEnd(); // End of right column div
+		$this->rowEnd(); // End of div around left and right column
 
 		echo $this->callHook('postContent');