diff --git a/application/views/widgets/filter/filter.php b/application/views/widgets/filter/filter.php
index 2b36a5bf5..2830d52e7 100644
--- a/application/views/widgets/filter/filter.php
+++ b/application/views/widgets/filter/filter.php
@@ -56,6 +56,40 @@
 		border-right: 2px solid #428bca;
 	}
 
+	.select-filter-operation {
+		display: inline;
+		width: 130px;
+	}
+
+	.select-filter-operation-value {
+		display: inline;
+		width: 400px;
+	}
+
+	.select-filter-option {
+		display: inline;
+		width: 90px;
+	}
+
+	#addField {
+		display: inline;
+		width: 400px;
+	}
+
+	#addFilter {
+		display: inline;
+		width: 400px;
+	}
+
+	#selectedFilters {
+		margin-bottom: 20px;
+	}
+
+	#customFilterDescription {
+		display: inline;
+		width: 400px;
+	}
+
 </style>
 <script language="Javascript" type="text/javascript">
 
diff --git a/application/views/widgets/filter/saveFilter.php b/application/views/widgets/filter/saveFilter.php
index a99e5ca53..40c43773f 100644
--- a/application/views/widgets/filter/saveFilter.php
+++ b/application/views/widgets/filter/saveFilter.php
@@ -29,8 +29,11 @@
 </script>
 
 <div>
-	Filter description: <input type="text" id="customFilterDescription" value="" class="">
-</div>
-<div>
-	<input type="button" id="saveCustomFilterButton" value="Save filter">
+	<span>
+		Filter description: <input type="text" id="customFilterDescription" value="">
+	</span>
+
+	<span>
+		<input type="button" id="saveCustomFilterButton" value="Save filter">
+	</span>
 </div>
diff --git a/application/views/widgets/filter/selectFields.php b/application/views/widgets/filter/selectFields.php
index 6ce678fb8..95dc5ae80 100644
--- a/application/views/widgets/filter/selectFields.php
+++ b/application/views/widgets/filter/selectFields.php
@@ -145,7 +145,7 @@
 					$("#filterSelectFieldsDnd").append(strHtml);
 				}
 
-				var strDropDown = '<option value="">Select a field to add..</option>';
+				var strDropDown = '<option value="">Select a field to add...</option>';
 				$("#addField").append(strDropDown);
 
 				for (var i = 0; i < data.allSelectedFields.length; i++)
@@ -189,7 +189,8 @@
 		<span>
 			Add field:
 		</span>
+
 		<span>
-			<select id="addField" class=""></select>
+			<select id="addField"></select>
 		</span>
 	</div>
diff --git a/application/views/widgets/filter/selectFilters.php b/application/views/widgets/filter/selectFilters.php
index 54f7f90fd..5b33352c5 100644
--- a/application/views/widgets/filter/selectFilters.php
+++ b/application/views/widgets/filter/selectFilters.php
@@ -125,7 +125,7 @@
 		if (metaData.type.toLowerCase().indexOf("int") >= 0)
 		{
 			html = '<span>';
-			html += '	<select class="select-filter-operation">';
+			html += '	<select class="select-filter-operation form-control">';
 			html += '		<option value="equal" ' + (activeFiltersOperation == "equal" ? "selected" : "") + '>equal</option>';
 			html += '		<option value="nequal" ' + (activeFiltersOperation == "nqual" ? "selected" : "") + '>not equal</option>';
 			html += '		<option value="gt" ' + (activeFiltersOperation == "gt" ? "selected" : "") + '>greater than</option>';
@@ -133,37 +133,37 @@
 			html += '	</select>';
 			html += '</span>';
 			html += '<span>';
-			html += '	<input type="number" value="' + activeFilters + '" class="select-filter-operation-value">';
+			html += '	<input type="number" value="' + activeFilters + '" class="select-filter-operation-value form-control">';
 			html += '</span>';
 		}
 		if (metaData.type.toLowerCase().indexOf('varchar') >= 0)
 		{
 			html = '<span>';
-			html += '	<select class="select-filter-operation">';
+			html += '	<select class="select-filter-operation form-control">';
 			html += '		<option value="contains" ' + (activeFiltersOperation == "contains" ? "selected" : "") + '>contains</option>';
 			html += '		<option value="ncontains" ' + (activeFiltersOperation == "ncontains" ? "selected" : "") + '>does not contain</option>';
 			html += '	</select>';
 			html += '</span>';
 			html += '<span>';
-			html += '	<input type="text" value="' + activeFilters + '" class="select-filter-operation-value">';
+			html += '	<input type="text" value="' + activeFilters + '" class="select-filter-operation-value form-control">';
 			html += '</span>';
 		}
 		if (metaData.type.toLowerCase().indexOf('bool') >= 0)
 		{
 			html = '<span>';
-			html += '	<select class="select-filter-operation">';
+			html += '	<select class="select-filter-operation form-control">';
 			html += '		<option value="true" ' + (activeFiltersOperation == "true" ? "selected" : "") + '>is true</option>';
 			html += '		<option value="false" ' + (activeFiltersOperation == "false" ? "selected" : "") + '>is false</option>';
 			html += '	</select>';
 			html += '</span>';
 			html += '<span>';
-			html += '	<input type="hidden" value="' + activeFilters + '" class="select-filter-operation-value">';
+			html += '	<input type="hidden" value="' + activeFilters + '" class="select-filter-operation-value form-control">';
 			html += '</span>';
 		}
 		if (metaData.type.toLowerCase().indexOf('timestamp') >= 0 || metaData.type.toLowerCase().indexOf('date') >= 0)
 		{
-			var classOperation = 'select-filter-operation-value';
-			var classOption = 'select-filter-option';
+			var classOperation = 'select-filter-operation-value form-control';
+			var classOption = 'select-filter-option form-control';
 			var disabled = "";
 
 			if (activeFiltersOperation == "set" || activeFiltersOperation == "nset")
@@ -174,7 +174,7 @@
 			}
 
 			html = '<span>';
-			html += '	<select class="select-filter-operation">';
+			html += '	<select class="select-filter-operation form-control">';
 			html += '		<option value="lt" ' + (activeFiltersOperation == "lt" ? "selected" : "") + '>less than</option>';
 			html += '		<option value="gt" ' + (activeFiltersOperation == "gt" ? "selected" : "") + '>greater than</option>';
 			html += '		<option value="set" ' + (activeFiltersOperation == "set" ? "selected" : "") + '>is set</option>';
@@ -213,7 +213,7 @@
 
 			if (data != null)
 			{
-				var strDropDown = '<option value="">Select a filter to add..</option>';
+				var strDropDown = '<option value="">Select a filter to add...</option>';
 				$("#addFilter").append(strDropDown);
 
 				for (var i = 0; i < data.allSelectedFields.length; i++)
@@ -246,7 +246,7 @@
 					);
 
 					selectedFilters += '<span>';
-					selectedFilters += '<input type="button" value="X" class="remove-filter" filterToRemove="' + data.selectedFilters[i] + '">';
+					selectedFilters += '<input type="button" value="X" class="remove-filter btn btn-default" filterToRemove="' + data.selectedFilters[i] + '">';
 					selectedFilters += '</span>';
 
 					selectedFilters += '</div>';
@@ -280,8 +280,9 @@
 	<span>
 		Add filter:
 	</span>
+
 	<span>
-		<select id="addFilter" class=""></select>
+		<select id="addFilter"></select>
 	</span>
 
 	<span>