diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7f1edd68..a183c14e 100755
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,23 @@
 # CHANGELOG
+### Version 10.8
+- Fix API key update not returning error in correct format
+- Rewrite API page
+- Rewrite About page
+- Try to get measurement unit from ingredient supplier first for ingredient search in formulation
+- Table border removed from tables
+- Added support for a dark theme
+- Complete rewrite for Finished Product page
+- Various minor improvements for Formula view
+- Rewrite Sell Formula for BS5
+- Added a font size when exporting a PDF in Sell Formula
+- Added brand logo when exporting a PDF in Sell Formula
+- Added opacity for watermak in Sell Formula page
+- Replaced PDF export in Sell Formula with the native DataTables function
+- Removed the space from ml2L function when appending the measurement unit
+- Default PV Logo update
+- Refactor of validateFormula() function
+- Renamed clone formula to duplicate
+
 ### Version 10.7
 - Removed ingredient purity and dilutant from Finished Product page for cleaner view
 - Moved IFRA doc to a modal window
diff --git a/VERSION.md b/VERSION.md
index 4e74f9f0..f5d39891 100755
--- a/VERSION.md
+++ b/VERSION.md
@@ -1 +1 @@
-10.7
+10.8
diff --git a/core/finished_formula_data.php b/core/finished_formula_data.php
new file mode 100644
index 00000000..c403a14b
--- /dev/null
+++ b/core/finished_formula_data.php
@@ -0,0 +1,216 @@
+<?php
+
+define('__ROOT__', dirname(dirname(__FILE__))); 
+
+require_once(__ROOT__.'/inc/sec.php');
+require_once(__ROOT__.'/inc/opendb.php');
+require_once(__ROOT__.'/inc/settings.php');
+
+require_once(__ROOT__.'/libs/fpdf.php');
+require_once(__ROOT__.'/func/genBatchID.php');
+require_once(__ROOT__.'/func/genBatchPDF.php');
+require_once(__ROOT__.'/func/calcCosts.php');
+require_once(__ROOT__.'/func/calcPerc.php');
+require_once(__ROOT__.'/func/searchIFRA.php');
+require_once(__ROOT__.'/func/getIngSupplier.php');
+require_once(__ROOT__.'/func/validateFormula.php');
+
+if(!$_POST['id']){		
+	$response['data'] = [];    
+	header('Content-Type: application/json; charset=utf-8');
+	echo json_encode($response);
+	return;
+}
+
+
+$defPercentage = $settings['defPercentage'];
+
+$defCatClass = $_POST['defCatClass'] ?: $settings['defCatClass'];		 
+$id = mysqli_real_escape_string($conn, $_POST['id']);
+
+$meta = mysqli_fetch_array(mysqli_query($conn, "SELECT name,fid,catClass,finalType,defView,isProtected,notes,product_name FROM formulasMetaData WHERE id = '$id'"));
+
+if(!$meta['fid']){		
+	$response['Error'] = (string)'Requested id is not valid.';    
+	header('Content-Type: application/json; charset=utf-8');
+	echo json_encode($response);
+	return;
+}
+
+	
+$mg = mysqli_fetch_assoc(mysqli_query($conn, "SELECT SUM(quantity) AS total_mg FROM formulas WHERE fid = '".$meta['fid']."'"));
+	
+$bottle_id = $_POST['bottle_id'];
+$concentration =  $_POST['concentration'];
+$carrier_id = $_POST['carrier_id'];
+$lid_id = $_POST['lid_id'];
+	
+$bottle = mysqli_fetch_array(mysqli_query($conn, "SELECT price,ml,name FROM bottles WHERE id = '$bottle_id' AND price != 0 "));
+	
+$carrier_cost = mysqli_fetch_array(mysqli_query($conn, "SELECT price,size FROM suppliers WHERE ingID = '$carrier_id'"));
+	
+if($_POST['lid_id']){
+	$lid = mysqli_fetch_array(mysqli_query($conn, "SELECT  price,style FROM lids WHERE id = '$lid_id'"));
+}else{
+	$lid['price'] = 0;
+	$lid['style'] = 'none';
+}
+	
+$new_conc = $bottle['ml'] / 100 * $concentration;
+$carrier = $bottle['ml'] - $new_conc;
+	
+	
+if($_POST['supplier_id']){
+	$sid = $_POST['supplier_id'];
+}
+
+if($_POST['batch_id'] == '1'){
+
+	define('FPDF_FONTPATH',__ROOT__.'/fonts');
+	$batchID = genBatchID();
+	
+	genBatchPDF($meta['fid'],$batchID,$bottle['ml'],$new_conc,$mg['total_mg'],$defCatClass,$settings['qStep'], $defPercentage);
+
+	
+}
+
+
+$formula_q = mysqli_query($conn, "SELECT id,ingredient,concentration,quantity FROM formulas WHERE fid = '".$meta['fid']."' ORDER BY ingredient ASC");
+while ($formula = mysqli_fetch_array($formula_q)){
+	    $form[] = $formula;
+}
+
+foreach ($form as $formula){
+	
+	$ing_q = mysqli_fetch_array(mysqli_query($conn, "SELECT id, name, cas, $defCatClass, profile, odor, category, physical_state,usage_type AS classification, type, byPassIFRA FROM ingredients WHERE name = '".$formula['ingredient']."'"));
+	
+	$new_quantity = $formula['quantity'] / $mg['total_mg'] * $new_conc;
+
+	$conc = $formula['concentration'] / 100 * $formula['quantity']/$mg['total_mg'] * 100;
+  	$conc_final = $formula['concentration'] / 100 * $formula['quantity']/$mg['total_mg'] * $concentration;
+	
+	if($settings['multi_dim_perc'] == '1'){
+		$compos = mysqli_query($conn, "SELECT name,$defPercentage,cas FROM ingredient_compounds WHERE ing = '".$formula['ingredient']."'");
+		
+		while($compo = mysqli_fetch_array($compos)){
+			$cmp[] = $compo;
+		}
+		
+		foreach ($cmp as $a){
+			$arrayLength = count($a);
+			$i = 0;
+			while ($i < $arrayLength){
+				$c = multi_dim_search($a, 'cas', $ing_q['cas']?:'N/A')[$i];
+				$conc_a[$a['cas']] += $c['percentage']/100 * $formula['quantity'] * $formula['concentration'] / 100;
+				$conc_b[$a['cas']] += $c['percentage']/100 * $formula['quantity'] * $formula['concentration'] / $mg['total_mg']* $concentration / 100 ;
+				$i++;
+			}
+		}
+		$conc+=$conc_a[$a['cas']];
+		$conc_final+=$conc_b[$a['cas']];
+
+	}
+ 	
+	$r['formula_ingredient_id'] = (int)$formula['id'];  
+	$r['formula_name'] = (string)$meta['name'];
+	$r['fid'] = (string)$meta['fid'];
+	
+	$r['ingredient']['name'] = (string)$ingName ?: $formula['ingredient'];
+	$r['ingredient']['cas'] = (string)$ing_q['cas'] ?: 'N/A';
+	$r['quantity'] = number_format((float)$new_quantity, $settings['qStep'],'.', '') ?: 0;
+	$r['final_concentration'] = number_format((float)$conc_final, $settings['qStep']) ?: 0;
+	
+	if($sid){
+		$r['cost'] = (float)calcCosts(getSingleSupplier($sid,$ing_q['id'],$conn)['price'],$new_quantity, $formula['concentration'], getPrefSupplier($ing_q['id'],$conn)['size']);
+	}else{
+		$r['cost'] = (float)calcCosts(getPrefSupplier($ing_q['id'],$conn)['price'],$new_quantity, $formula['concentration'], getPrefSupplier($ing_q['id'],$conn)['size']);
+    } 
+
+	$u = explode(' - ',searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass));
+	
+	if(($u['0'] && $ing_q['byPassIFRA'] == 0)){
+		$r['usage_limit'] = number_format((float)$u['0']?:100, $settings['qStep']);
+		$r['usage_restriction'] = (string)$u['1'] ?: 'N/A';
+		$r['usage_regulator'] = (string)"IFRA";
+	}else{
+		$r['usage_limit'] = number_format((float)$ing_q["$defCatClass"], $settings['qStep']) ?: 100;
+		$r['usage_restriction'] = (int)$ing_q['classification'];
+		$r['usage_regulator'] = (string)"PV";
+		$r['ingredient']['classification'] = (int)$ing_q['classification'] ?: 1;
+	}
+		
+
+	$response['data'][] = $r;
+	
+	$conc_tot[] = $conc_final;
+	$new_tot[] = $new_quantity;
+	
+	if($sid){
+       $tot[] = calcCosts(getSingleSupplier($sid,$ing_q['id'],$conn)['price'],$new_quantity, $formula['concentration'], getPrefSupplier($ing_q['id'],$conn)['size']);
+	}else{
+		$tot[] = calcCosts(getPrefSupplier($ing_q['id'],$conn)['price'],$new_quantity, $formula['concentration'], getPrefSupplier($ing_q['id'],$conn)['size']);
+	}
+	
+}
+
+if(empty($r)){
+	$response['data'] = [];
+}
+$carrier_sub_cost = number_format($carrier_cost['price'] / $carrier_cost['size'] * $carrier, $settings['qStep']);
+
+$m['sub_total_quantity'] = number_format(array_sum($new_tot), $settings['qStep']);
+$m['carrier_quantity'] = number_format($carrier, $settings['qStep']);
+$m['carrier_quantity'] = number_format($carrier, $settings['qStep']);
+$m['carrier_cost'] =  (float)$carrier_sub_cost;
+$m['bottle_quantity'] = (float)$bottle['ml'];
+$m['lid_cost'] = (float)$lid['price'];
+$m['lid_style'] = (string)$lid['style'];
+$m['batchNo'] = $batchID;
+$m['total_quantity'] = (float)number_format( array_sum($new_tot) + $carrier,$settings['qStep']);
+$m['quantity_unit'] = (string)$settings['mUnit'];
+$m['sub_concentration'] = (float)number_format(array_sum($conc_tot),$settings['qStep']);
+$m['carrier_concentration'] = (float)number_format($carrier * 100 / $bottle['ml'],$settings['qStep']);
+$m['sub_cost'] = (float)number_format(array_sum($tot),$settings['qStep']);
+$m['bottle_cost'] = (float)number_format($bottle['price'],$settings['qStep']);
+$m['total_cost'] = (float)number_format(array_sum($tot) + $lid['price'] + $carrier_sub_cost + $bottle['price'], $settings['qStep']);
+
+
+$m['cat_class'] = (string)$defCatClass;
+$m['currency'] = (string)utf8_encode($settings['currency']);
+$m['product_concentration'] = (int)$concentration;
+$m['formula_name'] = (string)$meta['name'];
+$m['product_name'] = (string)$meta['product_name'] ?: '-';
+$m['fid'] = (string)$meta['fid'];
+
+
+
+if($m['sub_total_quantity'] != 0){
+	$rs = validateFormula($meta['fid'], $bottle['ml'], $new_conc, $mg['total_mg'], $defCatClass, $settings['qStep']);
+	if($rs !== 0){
+		foreach ($rs as $error) {
+        	$inval_materials[] = $error;
+    	}
+		$val_status = 1;
+		$val_slug = "danger";
+		$val_msg .= "Your formula contains materials not compatible with IFRA standards";
+	}
+}
+
+$compliance['checked_for'] = $defCatClass;
+$compliance['final_total_ml'] = (float)$mg['total_mg'];
+$compliance['final_type_conc'] = (int)$concentration;
+$compliance['carrier'] = (float)$carrier;
+$compliance['status'] = (int)$val_status ?: 0;
+$compliance['slug'] = (string)$val_slug ?: "success";
+$compliance['message'] = (string)$val_msg ?: 'Formula is IFRA compliant';
+
+$compliance['inval_materials'] = array( "data" => $inval_materials );
+
+$response['compliance'] = $compliance;
+$response['meta'] = $m;
+
+
+header('Content-Type: application/json; charset=utf-8');
+echo json_encode($response);
+return;
+?>
\ No newline at end of file
diff --git a/core/full_formula_data.php b/core/full_formula_data.php
index efe21318..bab7e72c 100644
--- a/core/full_formula_data.php
+++ b/core/full_formula_data.php
@@ -163,8 +163,9 @@
 		$chName = mysqli_fetch_array(mysqli_query($conn,"SELECT chemical_name FROM ingredients WHERE name = '".$formula['ingredient']."'"));
 		$ingName = $chName['chemical_name'];
 	}
-	$r['formula_ingredient_id'] = (int)$formula['id'];       
-	$r['fid'] = (string)$meta['name']; //TODO
+	$r['formula_ingredient_id'] = (int)$formula['id'];  
+	$r['formula_name'] = (string)$meta['name'];
+	$r['fid'] = (string)$meta['fid']; //TODO
 		
 	if($settings['grp_formula'] == '1'){
 		$r['ingredient']['profile'] = (string)$ing_q['profile'] ?: 'Unknown';
@@ -277,7 +278,7 @@
 
 
 if($m['total_ingredients'] != 0 && !$_POST['search']){	
-	if( validateFormula($meta['fid'], $_GET['final_total_ml'] ?: 100, $new_conc, $mg['total_mg'], $_GET['val_cat']?:	$defCatClass, $settings['qStep'], $conn) == TRUE){
+	if( validateFormula($meta['fid'], $_GET['final_total_ml'] ?: 100, $new_conc, $mg['total_mg'], $_GET['val_cat']?:	$defCatClass, $settings['qStep']) == TRUE){
 		$val_status = 1;
 		$val_msg = 'Your formula contains materials, exceeding and/or missing IFRA standards. Please alter your formula.';
 	}
diff --git a/core/list_ingredients_simple.php b/core/list_ingredients_simple.php
index dc833539..81dcb79d 100644
--- a/core/list_ingredients_simple.php
+++ b/core/list_ingredients_simple.php
@@ -35,7 +35,7 @@
 $i = 0;
 foreach ($ingredients as $ingredient) { 
 
-	
+	$supp = getIngSupplier($ingredient['id'],1,$conn); 
 	$r['id'] = (int)$ingredient['id'];
 	$r['name'] = (string)$ingredient['name'];
 	$r['IUPAC'] = (string)$ingredient['INCI']?: 'N/A';
@@ -45,7 +45,8 @@
 	$r['description'] = (string)$ingredient['odor'] ?: 'N/A';
 	$r['physical_state'] = (int)$ingredient['physical_state'] ?: 1;
 	$r['profile'] = (string)$ingredient['profile'] ?: 'Uknwown';
-	$r['stock'] = (float)number_format(getIngSupplier($ingredient['id'],1,$conn)['stock'], $settings['qStep']) ?: 0;
+	$r['stock'] = (float)number_format($supp['stock'], $settings['qStep']) ?: 0;
+	$r['mUnit'] = (string)$supp['mUnit'];
 
 	$rx[]=$r;
 	$i++;
diff --git a/css/bootstrap-tagsinput.css b/css/bootstrap-tagsinput.css
index 7fced300..514fc5e4 100644
--- a/css/bootstrap-tagsinput.css
+++ b/css/bootstrap-tagsinput.css
@@ -4,7 +4,7 @@
  */
 
 .bootstrap-tagsinput {
-  background-color: #fff;
+  background-color: var( --bs-body-bg);
   border: 1px solid #ccc;
   box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);
   display: inline-block;
@@ -42,7 +42,7 @@
 }
 .bootstrap-tagsinput .tag {
   margin-right: 2px;
-  color: white;
+  color: var(  --bs-light );
 }
 .bootstrap-tagsinput .tag [data-role="remove"] {
   margin-left: 8px;
diff --git a/css/ifraCert.css b/css/ifraCert.css
index c06cb7b5..94926ea4 100644
--- a/css/ifraCert.css
+++ b/css/ifraCert.css
@@ -1,56 +1,64 @@
-@page { 
-	margin-right: 0.69in; 
-	margin-top: 0.39in; 
-	margin-bottom: 0.59in; 
-}
-
-p { 
-	margin-bottom: 0in; 
-	direction: ltr; 
-	color: #000000; 
-	widows: 2; 
-	orphans: 2;
-}
-
-p.western { 
-	font-family: "Times New Roman", serif; 
-	font-size: 10pt; 
-}
-
-p.cjk { 
-	font-family: "Times New Roman", serif; 
-	font-size: 10pt 
-}
-
-p.ctl { 
-	font-family: "Times New Roman", serif; 
-	font-size: 10pt; 
-}
-
-h1 { 
-	margin-top: 0in; 
-	margin-bottom: 0in; 
-	direction: ltr; 
-	color: #000000; 
-	text-align: center; 
-	widows: 2; 
-	orphans: 2;
-}
-
-h1.western { 
-	font-family: "Helvetica 45 Light", "Vrinda", sans-serif; 
-	font-size: 16pt; 
-	font-style: italic;
-}
-
-h1.cjk { 
-	font-family: "Times New Roman", serif; 
-	font-size: 16pt; 
-	font-style: italic;
-}
-
-h1.ctl { 
-	font-family: "Helvetica 45 Light", "Vrinda", sans-serif; 
-	font-size: 10pt; 
-	font-weight: normal; 
-}
+@page { 
+	margin-right: 0.69in; 
+	margin-top: 0.39in; 
+	margin-bottom: 0.59in; 
+}
+
+p { 
+	margin-bottom: 0in; 
+	direction: ltr; 
+	color:  var(--bs-body-color); 
+	widows: 2; 
+	orphans: 2;
+}
+
+p.western { 
+	font-family: "Times New Roman", serif; 
+	font-size: 10pt; 
+}
+
+p.cjk { 
+	font-family: "Times New Roman", serif; 
+	font-size: 10pt 
+}
+
+p.ctl { 
+	font-family: "Times New Roman", serif; 
+	font-size: 10pt; 
+}
+
+h1 { 
+	margin-top: 0in; 
+	margin-bottom: 0in; 
+	direction: ltr; 
+	color:  var(--bs-body-color);
+	text-align: center; 
+	widows: 2; 
+	orphans: 2;
+}
+
+h1.western { 
+	font-family: "Helvetica 45 Light", "Vrinda", sans-serif; 
+	font-size: 16pt; 
+	font-style: italic;
+}
+
+h1.cjk { 
+	font-family: "Times New Roman", serif; 
+	font-size: 16pt; 
+	font-style: italic;
+}
+
+h1.ctl { 
+	font-family: "Helvetica 45 Light", "Vrinda", sans-serif; 
+	font-size: 10pt; 
+	font-weight: normal; 
+}
+
+body {
+  background-color: var(--bs-body-bg);
+  color: var(--bs-body-color);
+  margin: 0;
+  padding: 0;
+  font-family: var(--bs-body-font-family); /* Use Bootstrap's default font */
+}
diff --git a/css/jquery-ui.css b/css/jquery-ui.css
index d394bd2d..d263017d 100755
--- a/css/jquery-ui.css
+++ b/css/jquery-ui.css
@@ -898,20 +898,20 @@ body .ui-tooltip {
 	font-size: 1em;
 }
 .ui-widget.ui-widget-content {
-	border: 1px solid #c5c5c5;
+	border: 1px solid var(--bs-border-color);
 }
 .ui-widget-content {
-	border: 1px solid #dddddd;
-	background: #ffffff;
-	color: #333333;
+	border: 1px solid var(--bs-border-color);
+	background: var(--bs-body-bg);
+	color: var(--bs-body-color);
 }
 .ui-widget-content a {
-	color: #333333;
+	color: var(--bs-body-color);
 }
 .ui-widget-header {
-	border: 1px solid #dddddd;
-	background: #e9e9e9;
-	color: #333333;
+	border: 1px solid var(--bs-border-color);
+	background: var(--bs-body-bg);
+	color: var(--bs-body-color);
 	font-weight: bold;
 }
 .ui-widget-header a {
@@ -929,10 +929,10 @@ body .ui-tooltip {
 works properly when clicked or hovered */
 html .ui-button.ui-state-disabled:hover,
 html .ui-button.ui-state-disabled:active {
-	border: 1px solid #c5c5c5;
-	background: #f6f6f6;
+	border: 1px solid var(--bs-border-color);
+	background: var( --bs-body-bg);
 	font-weight: normal;
-	color: #454545;
+	color: var( --bs-body-color);
 }
 .ui-state-default a,
 .ui-state-default a:link,
@@ -941,7 +941,7 @@ a.ui-button,
 a:link.ui-button,
 a:visited.ui-button,
 .ui-button {
-	color: #454545;
+	color: var( --bs-body-color);
 	text-decoration: none;
 }
 .ui-state-hover,
@@ -952,10 +952,10 @@ a:visited.ui-button,
 .ui-widget-header .ui-state-focus,
 .ui-button:hover,
 .ui-button:focus {
-	border: 1px solid #cccccc;
-	background: #ededed;
+	border: 1px solid var(--bs-border-color);
+	background: var( --bs-body-bg);
 	font-weight: normal;
-	color: #2b2b2b;
+	color: var( --bs-body-color);
 }
 .ui-state-hover a,
 .ui-state-hover a:hover,
@@ -967,7 +967,7 @@ a:visited.ui-button,
 .ui-state-focus a:visited,
 a.ui-button:hover,
 a.ui-button:focus {
-	color: #2b2b2b;
+	color: var( --bs-tertiary-color);
 	text-decoration: none;
 }
 
@@ -980,15 +980,15 @@ a.ui-button:focus {
 a.ui-button:active,
 .ui-button:active,
 .ui-button.ui-state-active:hover {
-	border: 1px solid #003eff;
+	border: 1px solid var(--bs-border-color);
 	background: #007fff;
 	font-weight: normal;
-	color: #ffffff;
+	color: var( --bs-body-color);
 }
 .ui-icon-background,
 .ui-state-active .ui-icon-background {
-	border: #003eff;
-	background-color: #ffffff;
+	border: var(--bs-border-color);
+	background-color: var( --bs-body-bg);
 }
 .ui-state-active a,
 .ui-state-active a:link,
@@ -1002,12 +1002,12 @@ a.ui-button:active,
 .ui-state-highlight,
 .ui-widget-content .ui-state-highlight,
 .ui-widget-header .ui-state-highlight {
-	border: 1px solid #dad55e;
-	background: #fffa90;
-	color: #777620;
+	border: 1px solid var(--bs-border-color);
+	background: var( --bs-body-bg);
+	color: var( --bs-body-color);
 }
 .ui-state-checked {
-	border: 1px solid #dad55e;
+	border: 1px solid var(--bs-border-color);
 	background: #fffa90;
 }
 .ui-state-highlight a,
@@ -1018,7 +1018,7 @@ a.ui-button:active,
 .ui-state-error,
 .ui-widget-content .ui-state-error,
 .ui-widget-header .ui-state-error {
-	border: 1px solid #f1a899;
+	border: 1px solid var(--bs-border-color);
 	background: #fddfdf;
 	color: #5f3f3f;
 }
diff --git a/css/makeFormula.css b/css/makeFormula.css
index 69b6bfa5..c8828433 100644
--- a/css/makeFormula.css
+++ b/css/makeFormula.css
@@ -1,5 +1,5 @@
 .table {
-	--bs-table-bg:  initial;
+	--bs-table-bg:  var(--bs-body-bg);
 }
 table.dataTable {
 	font-size: x-large !important;
diff --git a/css/sb-admin-2.css b/css/sb-admin-2.css
index c8ffdd67..7e506ef5 100755
--- a/css/sb-admin-2.css
+++ b/css/sb-admin-2.css
@@ -11,27 +11,7 @@
  * Licensed under MIT (https://github.com/twbs/bootstrap/blob/master/LICENSE)
  */
 :root {
-  --blue: #4e73df;
-  --indigo: #6610f2;
-  --purple: #6f42c1;
-  --pink: #e83e8c;
-  --red: #e74a3b;
-  --orange: #fd7e14;
-  --yellow: #f6c23e;
-  --green: #1cc88a;
-  --teal: #20c9a6;
-  --cyan: #36b9cc;
-  --white: #fff;
-  --gray: #858796;
-  --gray-dark: #5a5c69;
-  --primary: #4e73df;
-  --secondary: #858796;
-  --success: #1cc88a;
-  --info: #36b9cc;
-  --warning: #f6c23e;
-  --danger: #e74a3b;
-  --light: #f8f9fc;
-  --dark: #5a5c69;
+
   --breakpoint-xs: 0;
   --breakpoint-sm: 576px;
   --breakpoint-md: 768px;
@@ -165,7 +145,6 @@ a {
 }
 
 a:hover {
-  color: #224abe;
   text-decoration: underline;
 }
 
@@ -535,11 +514,6 @@ kbd kbd {
   font-weight: 700;
 }
 
-pre {
-  display: block;
-  font-size: 87.5%;
-  color: #3a3b45;
-}
 
 pre code {
   font-size: inherit;
@@ -1366,27 +1340,7 @@ pre code {
   }
 }
 
-.table {
-  width: 100%;
-  margin-bottom: 1rem;
-  color: #858796;
-}
 
-.table th,
-.table td {
-  padding: 0.75rem;
-  vertical-align: top;
-  border-top: 1px solid #e3e6f0;
-}
-
-.table thead th {
-  vertical-align: bottom;
-  border-bottom: 2px solid #e3e6f0;
-}
-
-.table tbody + tbody {
-  border-top: 2px solid #e3e6f0;
-}
 
 .table-sm th,
 .table-sm td {
@@ -1614,11 +1568,7 @@ pre code {
   background-color: rgba(0, 0, 0, 0.075);
 }
 
-.table .thead-dark th {
-  color: #fff;
-  background-color: #5a5c69;
-  border-color: #6c6e7e;
-}
+
 
 .table .thead-light th {
   color: #6e707e;
@@ -1626,29 +1576,7 @@ pre code {
   border-color: #e3e6f0;
 }
 
-.table-dark {
-  color: #fff;
-  background-color: #5a5c69;
-}
 
-.table-dark th,
-.table-dark td,
-.table-dark thead th {
-  border-color: #6c6e7e;
-}
-
-.table-dark.table-bordered {
-  border: 0;
-}
-
-.table-dark.table-striped tbody tr:nth-of-type(odd) {
-  background-color: rgba(255, 255, 255, 0.05);
-}
-
-.table-dark.table-hover tbody tr:hover {
-  color: #fff;
-  background-color: rgba(255, 255, 255, 0.075);
-}
 
 @media (max-width: 575.98px) {
   .table-responsive-sm {
@@ -5376,13 +5304,13 @@ a.badge-dark:focus, a.badge-dark.focus {
   font-size: 1.5rem;
   font-weight: 700;
   line-height: 1;
-  color: #000;
+  color: var(--bs-body-color);
   text-shadow: 0 1px 0 #fff;
   opacity: .5;
 }
 
 .close:hover {
-  color: #000;
+  color: var(--bs-secondary-color);
   text-decoration: none;
 }
 
@@ -9570,7 +9498,7 @@ a:focus {
 }
 
 #wrapper #content-wrapper {
-  background-color: #f8f9fc;
+  background-color: var(--bs-body-bg);
   width: 100%;
   overflow-x: hidden;
 }
diff --git a/css/select2.css b/css/select2.css
index f274e9fd..68c00569 100644
--- a/css/select2.css
+++ b/css/select2.css
@@ -48,7 +48,7 @@
         -webkit-appearance: none; }
 
 .select2-dropdown {
-  background-color: white;
+  background-color: var(--bs-body-bg);
   border: 1px solid #aaa;
   border-radius: 4px;
   box-sizing: border-box;
@@ -128,11 +128,11 @@
   white-space: nowrap !important; }
 
 .select2-container--default .select2-selection--single {
-  background-color: #fff;
+  background-color: var(--bs-body-bg);
   border: 1px solid #aaa;
   border-radius: 4px; }
   .select2-container--default .select2-selection--single .select2-selection__rendered {
-    color: #444;
+    color: var( --bs-body-color);
     line-height: 28px; }
   .select2-container--default .select2-selection--single .select2-selection__clear {
     cursor: pointer;
diff --git a/css/vault.css b/css/vault.css
index ec62854d..6197f556 100755
--- a/css/vault.css
+++ b/css/vault.css
@@ -73,7 +73,9 @@ html {
 	background-color:#FFF;
 }
 
-a { text-decoration: none; }
+a { 
+	text-decoration: none;
+}
 
 .navbar {
     position: relative;
@@ -328,7 +330,7 @@ tr.strikeout td:before {
 }
 
 .loader-text {
-  color: #000;
+  color: var( --bs-body-color);
   font-family: arial, sans-serif;
   text-align:center;
 }
@@ -436,8 +438,8 @@ formula td, table.table th {
 .mgmIngHeader {
 	font-size: 3rem;
 	line-height: 3rem;
-	color: #004372;
-	background: white;
+	color: var( --bs-body-color);
+	background: var( --bs-body-bg);
 }
 .mgmIngHeader-with-separator::after {
     content: '';
@@ -466,7 +468,7 @@ formula td, table.table th {
 	font-size: 1.875rem;
 	margin-top: 0.9375rem;
 	display: block;
-	background: white;
+	background: var( --bs-body-bg);
 }
 
 .mgm-row-xl > .mgm-row-inner > .mgm-column {
@@ -494,7 +496,7 @@ formula td, table.table th {
 }
 
 .mgm-cat-in {
-	color: #444444;
+	color: var( --bs-body-color);
 	font-size: 0.825rem;
 	text-transform: uppercase;
 	font-weight: 300;
@@ -520,7 +522,7 @@ formula td, table.table th {
 .listIngName {
     font-size: 1.1rem;
     line-height: 2rem;
-    color: #004372;
+    color: var( --bs-body-color);
   /*  background: white; */
 	font-weight: bolder;
 }
@@ -610,7 +612,7 @@ formula td, table.table th {
     -moz-osx-font-smoothing: grayscale;
     -webkit-font-smoothing: antialiased;
     font-size: 0.85rem;
-    color: #444444;
+    color: var( --bs-body-color);
     font-weight: 300;
 }
 
@@ -619,12 +621,12 @@ formula td, table.table th {
     -moz-osx-font-smoothing: grayscale;
     -webkit-font-smoothing: antialiased;
     font-size: 0.85rem;
-    color: #444444;
+    color: var( --bs-body-color);
     font-weight: 300;
 }
 
 .mgm-ing-bk {
-    background-color: white;
+    background-color: var( --bs-body-bg);
 }
 
 .ing_ico_list {
@@ -646,7 +648,7 @@ formula td, table.table th {
 }
 
 .mgm-ing-theme {
-	background-color: fff;
+	background-color: var( --bs-body-bg);
 	/*
 	background-image: linear-gradient(to bottom, transparent, white 75%), url("/img/molecule.png");
 	background-repeat: no-repeat;
@@ -755,7 +757,7 @@ table.fixedHeader-floating {
 }
 
 .pv_gen_li {
-	color: #23527c;
+	color: var( --bs-body-color);
 }
 
 .advanced_search_box {
@@ -784,7 +786,7 @@ table.fixedHeader-floating {
 	font-size: 1.2rem;
 	display: inline;
 	font-weight: bold;
-	color: #77716f !important
+	color: var( --bs-secondary-color ) !important;
 }
 
 .pv_exclusions {
@@ -843,7 +845,7 @@ body {
 }
 
 .add-new-ing-sel {
-	color: #337ab7;
+	color: var( --bs-body-color);
 	display: inline-table;
 	padding: 14px 14px 14px 8px;
 	height: 22px;
@@ -867,7 +869,7 @@ body {
 
 .select_search_deep {
   font-size: medium;
-  color: black;
+  color: var( --bs-body-color);
   display: inline;
   text-align: right;
   align-self: start;
@@ -909,12 +911,12 @@ body {
 	margin: 5px;
 	border-width: thin;
 }
-
+/*
 .bootstrap-select.disabled, .bootstrap-select > .disabled {
   cursor: not-allowed;
   background-color: #eee;
 }
-
+*/
 .shared-formula-accept {
   float: right;
   border: none;
@@ -1061,11 +1063,11 @@ body {
 #customer_name, #formula_name {
   display: inline;
 }
-
+/*
 table.dataTable thead tr {
 	background-color: #cececec9 !important;
 }
-
+*/
 table#tdDataPending.dataTable tbody tr:hover {
 	background-color: #ae9292;
 }
@@ -1082,6 +1084,10 @@ table#tdDataPending.dataTable thead:hover {
 	transform: scale(1.05);
 }
 
+.pv-transition td {
+    background-color: var(--bs-secondary-bg);
+}
+
 .schedule_details {
 	font-size: medium;
 	font-style: normal;
@@ -1094,7 +1100,6 @@ table#tdDataPending.dataTable thead:hover {
 }
 
 .pv_point_gen_color {
-	color: #23527c !important;
 	cursor: pointer !important;
 	font-style: normal;
 }
@@ -1202,13 +1207,8 @@ hr.hr-text::before {
 .text-reset {
  color:inherit!important
 }
-.link-primary {
- color:#0d6efd
-}
-.link-primary:focus,
-.link-primary:hover {
- color:#0a58ca
-}
+
+
 .link-secondary {
  color:#6c757d
 }
@@ -1468,4 +1468,22 @@ th.dt-center, td.dt-center {
 .bg-banned a {
   color: inherit;
   text-decoration: none;
-}
\ No newline at end of file
+}
+
+.btn-outline-pv-2 {
+  display: block;
+  width: 100%;
+  padding: .375rem .75rem;
+  font-size: 1rem;
+  font-weight: 400;
+  line-height: 1.5;
+  color: var(--bs-body-color);
+  -webkit-appearance: none;
+  -moz-appearance: none;
+  appearance: none;
+  background-color: var(--bs-body-bg);
+  background-clip: padding-box;
+  border: var(--bs-border-width) solid var(--bs-border-color);
+  border-radius: var(--bs-border-radius);
+  transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+}
diff --git a/db/pvault.sql b/db/pvault.sql
index 02d4b180..f0b83d99 100755
--- a/db/pvault.sql
+++ b/db/pvault.sql
@@ -327,7 +327,8 @@ CREATE TABLE `settings` (
   `pv_scale_host` varchar(255) COLLATE utf8_general_ci NOT NULL DEFAULT 'localhost',
   `pv_scale_enabled` INT NOT NULL DEFAULT '0',
   `pv_host` VARCHAR(255) NOT NULL DEFAULT 'localhost',
-  `sds_disclaimer` MEDIUMTEXT NOT NULL DEFAULT 'PLEASE ADD A PROPER DISCLAIMER MESSAGE'
+  `sds_disclaimer` MEDIUMTEXT NOT NULL DEFAULT 'PLEASE ADD A PROPER DISCLAIMER MESSAGE',
+  `bs_theme` VARCHAR(255) NOT NULL DEFAULT 'light'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_general_ci;
 
 INSERT INTO `settings` (`id`, `currency`, `top_n`, `heart_n`, `base_n`, `chem_vs_brand`, `grp_formula`, `brandName`, `brandAddress`, `brandEmail`, `brandPhone`, `brandLogo`) VALUES
diff --git a/db/schema.ver b/db/schema.ver
index 4e74f9f0..f5d39891 100644
--- a/db/schema.ver
+++ b/db/schema.ver
@@ -1 +1 @@
-10.7
+10.8
diff --git a/db/updates/update_10.7-10.8.sql b/db/updates/update_10.7-10.8.sql
new file mode 100644
index 00000000..1222f195
--- /dev/null
+++ b/db/updates/update_10.7-10.8.sql
@@ -0,0 +1 @@
+ALTER TABLE `settings` ADD `bs_theme` VARCHAR(255) NOT NULL DEFAULT 'light' AFTER `sds_disclaimer`; 
\ No newline at end of file
diff --git a/func/apiCheckAuth.php b/func/apiCheckAuth.php
index 9ae304c5..c87bfd68 100644
--- a/func/apiCheckAuth.php
+++ b/func/apiCheckAuth.php
@@ -3,8 +3,9 @@
 
 function apiCheckAuth($username, $password ,$dbhost, $dbuser, $dbpass, $dbname){
 	$conn = mysqli_connect($dbhost, $dbuser, $dbpass, $dbname) or die ('Error connecting to database');
-        $row = mysqli_fetch_assoc(mysqli_query($conn,"SELECT id FROM users WHERE username='$username' AND password=PASSWORD('$password')"));
-        return $row['id'];
+    $row = mysqli_fetch_assoc(mysqli_query($conn,"SELECT id FROM users WHERE username='$username' AND password=PASSWORD('$password')"));
+    
+	return $row['id'];
 
 }
 ?>
diff --git a/func/getIngSupplier.php b/func/getIngSupplier.php
index 62a6bdc3..d664ddb8 100644
--- a/func/getIngSupplier.php
+++ b/func/getIngSupplier.php
@@ -4,7 +4,7 @@
 function getIngSupplier($ingID,$getStock,$conn){
 	
 if($getStock == 1){
-	$result = mysqli_fetch_array(mysqli_query($conn, "SELECT SUM(stock) AS stock FROM suppliers WHERE ingID = '$ingID'"));	
+	$result = mysqli_fetch_array(mysqli_query($conn, "SELECT mUnit, SUM(stock) AS stock FROM suppliers WHERE ingID = '$ingID'"));	
 }else{
 	$q = mysqli_query($conn, "SELECT ingSupplierID,supplierLink,status FROM suppliers WHERE ingID = '$ingID'");
 	while($r = mysqli_fetch_array($q)){
diff --git a/func/ml2L.php b/func/ml2L.php
index a625663d..2d24ef58 100644
--- a/func/ml2L.php
+++ b/func/ml2L.php
@@ -6,7 +6,7 @@ function ml2L($ml, $s=2, $mUnit){
 	if($ml > 1000){
 		$conv = number_format($ml/1000, $s) .'L';
 	}else{
-		$conv = number_format($ml, $s).' '.$mUnit;
+		$conv = number_format($ml, $s).$mUnit;
 	}
 	return $conv;
 	
diff --git a/func/validateFormula.php b/func/validateFormula.php
index 1a674ef4..0e603071 100644
--- a/func/validateFormula.php
+++ b/func/validateFormula.php
@@ -1,42 +1,60 @@
 <?php 
 if (!defined('pvault_panel')){ die('Not Found');}
 
-function validateFormula($fid, $bottle, $new_conc, $mg, $defCatClass, $qStep, $conn ){
-	$formula_q = mysqli_query($conn, "SELECT ingredient,quantity,concentration FROM formulas WHERE fid = '$fid'");
-	while ($formula = mysqli_fetch_array($formula_q)) {
-		$ing_q = mysqli_fetch_array(mysqli_query($conn, "SELECT cas, $defCatClass FROM ingredients WHERE name = '".$formula['ingredient']."'"));
-
-		$limitIFRA = searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass);
-		$limit = explode(' - ', $limitIFRA);
-		$limit = $limit['0'];
-					  
-		$new_quantity = $formula['quantity']/$mg*$new_conc;
-		$conc = $new_quantity/$bottle * 100;						
-		$conc_p = number_format($formula['concentration'] / 100 * $conc, $qStep);
-					 	
-
-		if($limit != null){
-			if($limit < $conc_p){
-				$val[] = 1;//VALUE IS TO HIGH AGAINST IFRA
-			}else{
-				$val[] = 0; //VALUE IS OK
-			}
-		}else
-		  if($ing_q[$defCatClass] != null){
-		  	if($ing_q[$defCatClass] < $conc_p){
-				$val[] = 0; //VALUE IS TO HIGH AGAINST LOCAL DB BUT WILL BE IGNORED
-		  	}else{
-				$val[] = 0; //VALUE IS OK
-			}
-		}else{
-			$val[] = 1; //NO RECORD FOUND
-		}
-	}
-	if (in_array('1', $val)) {
-		return 1;
-	}else{
-		return 0;
-	}
+function validateFormula($fid, $bottle, $new_conc, $mg, $defCatClass, $qStep) {
+	global $conn;
+	
+    // Initialize arrays to collect validation results and error messages
+    $errors = array();
+
+    // Fetch formula details
+    $formula_query = mysqli_query($conn, "SELECT ingredient, quantity, concentration FROM formulas WHERE fid = '$fid'");
+    if (!$formula_query) {
+        return array("Error fetching formula details");
+    }
+
+    // Process each ingredient in the formula
+    while ($formula = mysqli_fetch_array($formula_query)) {
+        $ingredient_name = $formula['ingredient'];
+        $ingredient_query = mysqli_query($conn, "SELECT cas, $defCatClass FROM ingredients WHERE name = '$ingredient_name'");
+        if (!$ingredient_query) {
+            $errors[] = "Error fetching ingredient details for $ingredient_name";
+            continue;
+        }
+
+        $ing = mysqli_fetch_array($ingredient_query);
+        $cas = $ing['cas'];
+        $limitIFRA = searchIFRA($cas, $ingredient_name, null, $defCatClass);
+        $limit = explode(' - ', $limitIFRA)[0];
+
+        // Calculate new quantity and concentration
+        $new_quantity = $formula['quantity'] / $mg * $new_conc;
+        $conc = ($new_quantity / $bottle) * 100;
+        $conc_p = number_format(($formula['concentration'] / 100) * $conc, $qStep);
+
+        if ($limit ) {
+            if ($limit < $conc_p) {
+                $errors[] = "Ingredient $ingredient_name exceeds IFRA limit $limit%";
+            }
+        } else {
+            if ($ing[$defCatClass] !== null) {
+                if ($ing[$defCatClass] < $conc_p) {
+                    $errors[] = "Ingredient $ingredient_name exceeds local DB limit%";
+                }
+            } else {
+                $errors[] = "No limit record found for ingredient $ingredient_name";
+            }
+        }
+    }
+
+    // Return errors if any found
+    if (!empty($errors)) {
+        return $errors;
+    }
+
+    // Return 0 if all validations passed
+    return 0;
 }
 
+
 ?>
diff --git a/img/logo_def.png b/img/logo_def.png
index 4775d2d7..65eab2d6 100644
Binary files a/img/logo_def.png and b/img/logo_def.png differ
diff --git a/index.php b/index.php
index 1db7709a..0094339a 100755
--- a/index.php
+++ b/index.php
@@ -31,7 +31,7 @@
 
 ?>
 <!doctype html>
-<html lang="en" data-bs-theme="light">
+<html lang="en" data-bs-theme="<?=$settings['bs_theme']?>">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
diff --git a/js/bootstrap-select.js b/js/bootstrap-select.js
index 02686b31..e4e2b990 100755
--- a/js/bootstrap-select.js
+++ b/js/bootstrap-select.js
@@ -3522,7 +3522,7 @@
 
       classNames.DIVIDER = 'dropdown-divider';
       classNames.SHOW = 'show';
-      classNames.BUTTONCLASS = 'btn-light';
+      classNames.BUTTONCLASS = 'btn-outline-pv-2';
       classNames.POPOVERHEADER = 'popover-header';
       classNames.ICONBASE = '';
       classNames.TICKICON = 'bs-ok-default';
diff --git a/js/fullformula.view.js b/js/fullformula.view.js
index ea5d8f1b..e274cae2 100644
--- a/js/fullformula.view.js
+++ b/js/fullformula.view.js
@@ -248,14 +248,15 @@ $("#formula").on("click", ".open-replace-dialog", function () {
 			},
 			processResults: function(data) {
 				return {
-					results: $.map(data.data, function(obj) {
+					results: $.map(data.data, function(ingData) {
 					  return {
-						id: obj.name,
-						description: obj.description,
-						cas: obj.cas,
-						stock: obj.stock,
-						physical_state: obj.physical_state,
-						name: obj.name
+						id: ingData.name,
+						description: ingData.description,
+						cas: ingData.cas,
+						stock: ingData.stock,
+						physical_state: ingData.physical_state,
+						name: ingData.name,
+						mUnit: ingData.mUnit
 
 					  }
 					})
@@ -286,12 +287,8 @@ $("#formula").on("click", ".open-replace-dialog", function () {
 			return 'No ingredient found...';
 		}
 		
-		var measureIn;
-		if (ingredientData.physical_state == '1'){
-			measureIn = 'mL';
-		}else if (ingredientData.physical_state == '2'){
-			measureIn = 'grams';
-		}
+		let measureIn = ingredientData.mUnit || (ingredientData.physical_state == '1' ? 'mL' : ingredientData.physical_state == '2' ? 'grams' : '');
+
 		
 		var $container = $(
 			"<div class='select_result_igredient clearfix'>" +
diff --git a/js/mgmIngredient.js b/js/mgmIngredient.js
index b6304e32..4e1b1f47 100644
--- a/js/mgmIngredient.js
+++ b/js/mgmIngredient.js
@@ -190,9 +190,9 @@ $('#cloneIng').on('click', '[id*=cloneME]', function () {
 		dataType: 'json',
 		success: function (data) {
 			if(data.success){
-				msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.success + '</div>';
+				msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><i class="fa-solid fa-circle-check mx-2"></i>' + data.success + '</div>';
 			}else if(data.error){
-				msg = '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.error + '</div>';
+				msg = '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><i class="fa-solid fa-triangle-exclamation mx-2"></i>' + data.error + '</div>';
 			}
 			$('#clone_msg').html(msg);
 		}
diff --git a/js/select2-v3-ingredient.js b/js/select2-v3-ingredient.js
index ff35edb1..07e442ce 100644
--- a/js/select2-v3-ingredient.js
+++ b/js/select2-v3-ingredient.js
@@ -61,17 +61,18 @@ $(document).ready(function(){
 					$(".select2-totalRecords").html('');
 				}
 				return {
-					results: $.map(data.data, function(obj) {
+					results: $.map(data.data, function(ingData) {
 						return {
-							id: obj.id,
-							name: obj.name,
-							IUPAC: obj.IUPAC,
-							cas: obj.cas,
-							ingType: obj.type,
-							description: obj.description,
-							physical_state: obj.physical_state,
-							stock: obj.stock,
-							profile: obj.profile
+							id: ingData.id,
+							name: ingData.name,
+							IUPAC: ingData.IUPAC,
+							cas: ingData.cas,
+							ingType: ingData.type,
+							description: ingData.description,
+							physical_state: ingData.physical_state,
+							stock: ingData.stock,
+							profile: ingData.profile,
+							mUnit: ingData.mUnit
 						}
 					})
 				};
@@ -80,7 +81,7 @@ $(document).ready(function(){
 		}
 	  
 	}).on('select2:open', () => {
-		$(".select2-search:not(:has(a))").prepend('<div id="add_new_ing_sel" class="select_add_new_ingredient mb-2"><a class="text-primary fa fa-plus mx-2"></a><a href="/pages/mgmIngredient.php" class="popup-link text-primary add-new-ing-sel">Create new ingredient</a></div>');
+		$(".select2-search:not(:has(a))").prepend('<div id="add_new_ing_sel" class="select_add_new_ingredient mb-2"><a href="/pages/mgmIngredient.php" class="popup-link add-new-ing-sel"><i class="fa fa-plus mx-2"></i>Create new ingredient</a></div>');
 		
 		$(".select2-search:not(:has(i))").append('<div class="select2-totalRecords"></div><div class="select_deep_ingredient"><span><div id="select_search_deep" class="select_search_deep"><i class="pv_point_gen mx-2" rel="tip" data-placement="bottom" title="Extend search in synonyms"><input data-default="true" type="checkbox" id="isDeep"></i><label for="isDeep">Deep Search</label></div></span></div>');
 		
@@ -112,13 +113,8 @@ $(document).ready(function(){
 			return 'No ingredient found...';
 		}
 		
-		var measureIn;
-		if (ingredientData.physical_state == '1'){
-			measureIn = 'mL';
-		}else if (ingredientData.physical_state == '2'){
-			measureIn = 'grams';
-		}
-		
+		let measureIn = ingredientData.mUnit || (ingredientData.physical_state == '1' ? 'mL' : ingredientData.physical_state == '2' ? 'grams' : '');
+
 		var $container = $(
 			"<div class='select_result_igredient clearfix'>" +
 			  "<div class='select_result_igredient_meta'>" +
@@ -166,20 +162,20 @@ $(document).ready(function(){
 			data: {
 				filter: "purity",
 				id: ingID
-				},
+			},
 			dataType: 'json',
 			success: function (data) {
-			  if(ingType == 'Solvent'){
-				$("#concentration").prop("disabled", true); 
-				$("#dilutant").prop("disabled", true);
-				$("#concentration").val(100);
-				$("#dilutant").val('None');
-			  }else{
-				$("#concentration").prop("disabled", false);
-				$("#concentration").val(data.purity).trigger("input");;
-			  }
-			 $("#quantity").prop("disabled", false);
-			 $("#quantity").val();
+				if(ingType == 'Solvent'){
+					$("#concentration").prop("disabled", true); 
+					$("#dilutant").prop("disabled", true);
+					$("#concentration").val(100);
+					$("#dilutant").val('None');
+			  	}else{
+					$("#concentration").prop("disabled", false);
+					$("#concentration").val(data.purity).trigger("input");;
+			  	}
+			 	$("#quantity").prop("disabled", false);
+			 	$("#quantity").val();
 			}
 		  });
 		
diff --git a/login.php b/login.php
index 7cdacf05..579b392c 100755
--- a/login.php
+++ b/login.php
@@ -15,8 +15,7 @@
 ?>
 
 <!DOCTYPE html>
-<html lang="en">
-
+<html lang="en" data-bs-theme="light">
 <head>
 
   <meta charset="utf-8">
@@ -95,7 +94,7 @@
               <div class="col-lg-6">
                 <div class="p-5">
                   <div class="text-center">
-                    <h1 class="h4 text-gray-900 mb-4">Please login</h1>
+                    <h1 class="h4 mb-4">Please login</h1>
                   </div>
                   <div id="msg"></div>
                   <div class="user" id="login">
@@ -125,7 +124,7 @@
 			?>		 		 
                   <hr />
                   <div class="copyright text-center my-auto">
-				  <label class="small">Version: <?php echo $ver; ?> |<a href="https://www.perfumersvault.com/" class="link-dark mx-1" target="_blank"><?php echo $product; ?></a></label>
+				  <label class="small">Version: <?php echo $ver; ?> |<a href="https://www.perfumersvault.com/" class="mx-1" target="_blank"><?php echo $product; ?></a></label>
                   </div>
                 </div>
               </div>
diff --git a/pages/IFRA.php b/pages/IFRA.php
index 8c298c07..118f324e 100755
--- a/pages/IFRA.php
+++ b/pages/IFRA.php
@@ -7,7 +7,7 @@
           <div>
           <div class="card shadow mb-4">
             <div class="card-header py-3">
-              <h2 class="m-0 font-weight-bold text-primary"><a href="#" id="mainTitle">IFRA Library</a></h2>
+              <h2 class="m-0 font-weight-bold text-primary-emphasis"><a href="#" id="mainTitle">IFRA Library</a></h2>
             </div>
             <div class="card-body">
                <div id="iframsg"></div>
@@ -34,7 +34,7 @@
                 <div>
                 Toggle column: <a class="toggle-vis pv_point_gen_color" data-column="0">Structure</a> - <a class="toggle-vis pv_point_gen_color" data-column="4">Last publication</a>
     			</div>
-                <table id="tdDataIFRA" class="stripe row-border order-column" style="width:100%">
+                <table id="tdDataIFRA" class="table table-striped stripe row-border order-column" style="width:100%">
                   <thead>
                       <tr>
                       	<th>Structure</th>
diff --git a/pages/bottles.php b/pages/bottles.php
index 846e1216..96cb32e3 100644
--- a/pages/bottles.php
+++ b/pages/bottles.php
@@ -7,48 +7,39 @@
 	    $supplier[] = $suppliers;
 }
 ?>
-          <div>
-          <div class="card shadow mb-4">
-            <div class="card-header py-3">
-              <h2 class="m-0 font-weight-bold text-primary"><a href="#" id="mainTitle">Bottles</a></h2>
-            </div>
-            <div class="card-body">
-              <div class="table-responsive">
-               <table class="table table-striped table-bordered">
-                 <tr class="noBorder">
-                     <div class="text-right">
-                      <div class="btn-group">
-                          <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
-                          <div class="dropdown-menu dropdown-menu-right">
-            				<li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#addBottle"><i class="fa-solid fa-plus mx-2"></i>Add new</a></li>
-                            <li><a class="dropdown-item" id="exportCSV" href="#"><i class="fa-solid fa-file-export mx-2"></i>Export to CSV</a></li>
-                             <li><a class="dropdown-item" id="exportJSON" href="/pages/export.php?format=json&kind=bottles"><i class="fa-solid fa-file-export mx-2"></i>Export to JSON</a></li>
-
-                          </div>
-                        </div>        
-                     </div>
-                 </tr>
-                </table>
-                <table class="table table-bordered" id="tdDataBottles" width="100%" cellspacing="0">
-                  <thead>
-                    <tr>
-                      <th>Name</th>
-                      <th>Size (ml)</th>
-                      <th>Price</th>
-                      <th>Supplier</th>
-                      <th>Pieces</th>
-                      <th>Created</th>
-                      <th>Updated</th>
-                      <th></th>
-                    </tr>
-                  </thead>
-                </table>
+  <div class="card shadow mb-4">
+      <div class="card-header py-3">
+         <h2 class="m-0 font-weight-bold text-primary"><a href="#" id="mainTitle">Bottles</a></h2>
+      </div>
+      <div class="card-body">
+      	<div class="text-right">
+           	<div class="btn-group">
+               	<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
+                 <div class="dropdown-menu dropdown-menu-right">
+                 <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#addBottle"><i class="fa-solid fa-plus mx-2"></i>Add new</a></li>
+                 <li><a class="dropdown-item" id="exportCSV" href="#"><i class="fa-solid fa-file-export mx-2"></i>Export to CSV</a></li>
+                 <li><a class="dropdown-item" id="exportJSON" href="/pages/export.php?format=json&kind=bottles"><i class="fa-solid fa-file-export mx-2"></i>Export to JSON</a></li>
               </div>
-            </div>
-          </div>
+            </div>        
+        </div>   
+        <table class="table table-striped" id="tdDataBottles" width="100%" cellspacing="0">
+           <thead>
+              <tr>
+                <th>Name</th>
+                <th>Size (ml)</th>
+                <th>Price</th>
+                <th>Supplier</th>
+                <th>Pieces</th>
+                <th>Created</th>
+                <th>Updated</th>
+                <th></th>
+              </tr>
+            </thead>
+          </table>
         </div>
       </div>
     </div>
+  </div>
 
 <!-- ADD BOTTLE MODAL-->
 <div class="modal fade" id="addBottle" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="addBottle" aria-hidden="true">
@@ -154,7 +145,7 @@
 	var tdDataBottles = $('#tdDataBottles').DataTable( {
 	columnDefs: [
 		{ className: 'pv_vertical_middle text-center', targets: '_all' },
-		{ orderable: false, targets: [5] },
+		{ orderable: false, targets: [7] },
 	],
 	dom: 'lrftip',
 	buttons: [{
@@ -257,7 +248,7 @@ function name(data, type, row){
 	
 	function actions(data, type, row){	
 			data = '<div class="dropdown">' +
-			'<button type="button" class="btn btn-primary btn-floating dropdown-toggle hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+			'<button type="button" class="btn btn-floating hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
 				'<ul class="dropdown-menu dropdown-menu-right">';
 			data += '<li><a href="#" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#editBottle" rel="tip" title="Edit '+ row.name +'" data-id='+ row.id +' data-name="'+ row.name +'"><i class="fas fa-edit mx-2"></i>Edit</a></li>';
 			data += '<li><a href="'+ row.supplier_link +'" class="dropdown-item" target="_blank" rel="tip" title="Open '+ row.supplier +' page"><i class="fas fa-shopping-cart mx-2"></i>Go to supplier</a></li>';
diff --git a/pages/cart.php b/pages/cart.php
index 7ac4b161..95cf5cdd 100644
--- a/pages/cart.php
+++ b/pages/cart.php
@@ -4,18 +4,18 @@
   <div>
   <div class="card shadow mb-4">
     <div class="card-header py-3">
-      <h2 class="m-0 font-weight-bold text-primary"><a href="javascript:reload_data()">Cart</a></h2>
+      <h2 class="m-0 font-weight-bold text-primary"><a href="#" id="mainTitle">Cart</a></h2>
     </div>
     <div class="card-body">
       <div class="table-responsive">
       <div id="innermsg"></div>
-        <table class="table table-bordered" id="tdDataCart" width="100%" cellspacing="0">
+        <table class="table table-striped" id="tdDataCart" width="100%" cellspacing="0">
           <thead>
             <tr>
               <th>Ingredient</th>
               <th>Purity (%)</th>
               <th>Quantity (ml)</th>
-              <th>Actions</th>
+              <th></th>
             </tr>
           </thead>
         </table>
@@ -29,121 +29,126 @@
 $(document).ready(function() {
 
 	var tdDataCart = $('#tdDataCart').DataTable( {
-	columnDefs: [
-		{ className: 'pv_vertical_middle text-center', targets: '_all' },
-		{ orderable: false, targets: [3] },
-	],
-	dom: 'lrftip',
-	processing: true,
-	serverSide: true,
-	searching: true,
-	mark: true,
-	language: {
-		loadingRecords: '&nbsp;',
-		processing: 'Please Wait...',
-		zeroRecords: 'Nothing found',
-		search: 'Quick Search:',
-		searchPlaceholder: 'Name..',
+		columnDefs: [
+			{ className: 'pv_vertical_middle text-center', targets: '_all' },
+			{ orderable: false, targets: [3] },
+		],
+		dom: 'lrftip',
+		processing: true,
+		serverSide: true,
+		searching: true,
+		mark: true,
+		language: {
+			loadingRecords: '&nbsp;',
+			processing: 'Please Wait...',
+			zeroRecords: 'Nothing found',
+			search: 'Quick Search:',
+			searchPlaceholder: 'Name..',
 		},
-	ajax: {	
-		url: '/core/cart_data.php',
-		type: 'POST',
-		dataType: 'json',
-		data: function(d) {
+		ajax: {	
+			url: '/core/cart_data.php',
+			type: 'POST',
+			dataType: 'json',
+			data: function(d) {
 				if (d.order.length>0){
 					d.order_by = d.columns[d.order[0].column].data
 					d.order_as = d.order[0].dir
 				}
 			},
 		},
-	   columns: [
-            { data : 'name', title: 'Ingredient', render: name },
+		columns: [
+			{ data : 'name', title: 'Ingredient', render: name },
 			{ data : 'purity', title: 'Purity (%)' },
-			{ data : 'quantity', title: 'Quantity (ml)' },
-			{ data : null, title: 'Actions', render: actions },
-
-			],
-	order: [[ 0, 'asc' ]],
-	lengthMenu: [[20, 50, 100, 200, 400], [20, 50, 100, 200, 400]],
-	pageLength: 20,
-	displayLength: 20,
+			{ data : 'quantity', title: 'Quantity (<?=$settings['mUnit']?>)' },
+			{ data : null, title: '', render: actions },
+	
+		],
+		order: [[ 0, 'asc' ]],
+		lengthMenu: [[20, 50, 100, 200, 400], [20, 50, 100, 200, 400]],
+		pageLength: 20,
+		displayLength: 20
 	});
 	
-}); //END DOC
+	$('#mainTitle').click(function() {
+	 	reload_cart_data();
+  	});
 
-function reload_data() {
-    $('#tdDataCart').DataTable().ajax.reload(null, true);
-}
 
-function name(data, type, row){
-	if(row.supplier){
-		data ='<div class="btn-group"><a href="#" class="dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">'+row.name+'</a><div class="dropdown-menu dropdown-menu-right">';
-		for (var key in row.supplier) {
-			if (row.supplier.hasOwnProperty(key)) {
-				data+='<a class="dropdown-item" href="'+row.supplier[key].link+'" target="_blank">'+row.supplier[key].name+'</a>';
-			}
-		}                
-		data+='</div></div>';
-	}else{
-		data = 'N/A';
+	function reload_data() {
+		$('#tdDataCart').DataTable().ajax.reload(null, true);
 	}
-	return data;
-}
-
-function actions(data, type, row){
-	return '<i rel="tip" title="Remove '+ row.name +'" class="pv_point_gen fas fa-trash link-danger" id="cart_remove" data-name="'+ row.name +'" data-id='+ row.id +'></i>';    
-}
-
-function reload_cart_data() {
-    $('#tdDataCart').DataTable().ajax.reload(null, true);
-}
-
+	
+	function name(data, type, row){
+		if(row.supplier){
+			data ='<div class="btn-group"><a href="#" class="dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">'+row.name+'</a><div class="dropdown-menu dropdown-menu-right">';
+			for (var key in row.supplier) {
+				if (row.supplier.hasOwnProperty(key)) {
+					data+='<a class="dropdown-item" href="'+row.supplier[key].link+'" target="_blank">'+row.supplier[key].name+'</a>';
+				}
+			}                
+			data+='</div></div>';
+		}else{
+			data = 'N/A';
+		}
+		return data;
+	}
+	
+	function actions(data, type, row){
+		return '<i rel="tip" title="Remove '+ row.name +'" class="pv_point_gen fas fa-trash link-danger" id="cart_remove" data-name="'+ row.name +'" data-id='+ row.id +'></i>';    
+	}
+	
+	function reload_cart_data() {
+		$('#tdDataCart').DataTable().ajax.reload(null, true);
+	}
+	
+	
+	$('#tdDataCart').on('click', '[id*=cart_remove]', function () {
+		var ing = {};
+		ing.ID = $(this).attr('data-id');
+		ing.Name = $(this).attr('data-name');
+		
+		bootbox.dialog({
+		   title: "Confirm removal",
+		   message : 'Remove <strong>'+ ing.Name +'</strong> from shopping cart?',
+		   buttons :{
+			   main: {
+				   label : "Remove",
+				   className : "btn-danger",
+				   callback: function (){
+				   		$.ajax({
+							url: '/pages/manageFormula.php', 
+							type: 'POST',
+							data: {
+								action: "removeFromCart",
+								materialId: ing.ID,
+								materialName: ing.Name
+							},
+						dataType: 'json',
+						success: function (data) {
+							if(data.success) {
+								var msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.success + '</div>';
+									reload_cart_data();
+								} else {
+									var msg = '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.error + '</div>';
+					
+								}
+								$('#innermsg').html(msg);
+						}
+					});
+					
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
 
-$('#tdDataCart').on('click', '[id*=cart_remove]', function () {
-	var ing = {};
-	ing.ID = $(this).attr('data-id');
-	ing.Name = $(this).attr('data-name');
-    
-	bootbox.dialog({
-       title: "Confirm removal",
-       message : 'Remove <strong>'+ ing.Name +'</strong> from shopping cart?',
-       buttons :{
-           main: {
-               label : "Remove",
-               className : "btn-danger",
-               callback: function (){
-			   $.ajax({
-					url: '/pages/manageFormula.php', 
-					type: 'POST',
-					data: {
-						action: "removeFromCart",
-						materialId: ing.ID,
-						materialName: ing.Name
-						},
-					dataType: 'json',
-					success: function (data) {
-						if(data.success) {
-							var msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.success + '</div>';
-								reload_cart_data();
-							} else {
-								var msg = '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.error + '</div>';
-				
-							}
-							$('#innermsg').html(msg);
-					}
-				});
-				
-                 return true;
-               }
-           },
-           cancel: {
-               label : "Cancel",
-               className : "btn-secondary",
-               callback : function() {
-                   return true;
-               }
-           }   
-       },onEscape: function () {return true;}
-   });
-});
+}); //END DOC
 </script>
\ No newline at end of file
diff --git a/pages/compareFormulas.php b/pages/compareFormulas.php
index dd7bcf0e..99fffb02 100644
--- a/pages/compareFormulas.php
+++ b/pages/compareFormulas.php
@@ -4,25 +4,23 @@
     <div>
       <div class="card shadow mb-4">
         <div class="card-header py-3">
-          <h2 class="m-0 fw-bold text-primary">
-            <a href="/?do=compareFormulas">Compare formulas</a>
-          </h2>
+          <h2 class="m-0 fw-bold text-primary-emphasis">Compare formulas</h2>
         </div>
         <div class="card-body">
           <?php 
             if(mysqli_num_rows(mysqli_query($conn, "SELECT id FROM formulasMetaData"))== 0){
-              echo '<div class="alert alert-info alert-dismissible"><strong>INFO: </strong> You need to <a href="?do=listFormulas">create</a> at least one formula first.</div>';
+              echo '<div class="alert alert-info alert-dismissible"><strong>INFO: </strong> You need to <a href="/?do=listFormulas">create</a> at least one formula first.</div>';
               return;
             }
             
             if(mysqli_num_rows(mysqli_query($conn, "SELECT id FROM ingredients WHERE type = 'Carrier' OR type = 'Solvent'"))== 0){
-              echo '<div class="alert alert-info alert-dismissible"><strong>INFO: </strong> You need to <a href="?do=ingredients">add</a> at least one solvent or carrier first.</div>';
+              echo '<div class="alert alert-info alert-dismissible"><strong>INFO: </strong> You need to <a href="/?do=ingredients">add</a> at least one solvent or carrier first.</div>';
               return;
             }
           ?>
           <div>
             <div class="mb-3 row">
-              <label for="formula_a" class="col-sm-1 col-form-label">Formula A</label>
+              <label for="formula_a" class="col-form-label">Formula A</label>
               <div class="col-sm-10">
                 <select name="formula_a" id="formula_a" class="form-control selectpicker" data-live-search="true">
                   <?php
@@ -35,7 +33,7 @@
               </div>
             </div>
             <div class="mb-3 row">
-              <label for="formula_b" class="col-sm-1 col-form-label">Formula B</label>
+              <label for="formula_b" class="col-form-label">Formula B</label>
               <div class="col-sm-10">
                 <select name="formula_b" id="formula_b" class="form-control selectpicker" data-live-search="true">
                   <?php
@@ -61,18 +59,23 @@
 </div>
 
 <script>
-$('#btnCMP').click(function() {
-	$.ajax({ 
-		url: '/pages/views/formula/cmp_formulas_data.php', 
-		type: 'POST',
-		data: {
-			id_a: $("#formula_a").val(),			
-			id_b: $("#formula_b").val(),
-			},
-		dataType: 'html',
-		success: function (data) {
-			$('#cmp_results').html(data);
-		}
-	  });
+$(document).ready(function() {
+
+	$('#btnCMP').click(function() {
+		$.ajax({ 
+			url: '/pages/views/formula/cmp_formulas_data.php', 
+			type: 'POST',
+			data: {
+				id_a: $("#formula_a").val(),			
+				id_b: $("#formula_b").val(),
+				},
+			dataType: 'html',
+			success: function (data) {
+				$('#cmp_results').html(data);
+			}
+		  });
+	});
+	
 });
+
 </script>
\ No newline at end of file
diff --git a/pages/compounds.php b/pages/compounds.php
index 24148e6c..4e2bbfa4 100644
--- a/pages/compounds.php
+++ b/pages/compounds.php
@@ -16,34 +16,27 @@
       <h2 class="m-0 font-weight-bold text-primary"><a href="#" id="mainTitle">Compounds</a></h2>
     </div>
     <div class="card-body">
-      <div class="table-responsive">
-      <div id="innermsg"></div>
-       <table class="table table-striped table-bordered">
-         <tr class="noBorder">
-             <div class="form-inline mb-3">
-                <input type="text" class="form-control mt-2 ml-2" id="btlSize" placeholder="Enter bottle size, eg: 100">
-                <button type="button" class="btn btn-primary" id="submitBottleAmount">Submit</button>
-                <div class="ml-2 mt-2">
-                    <input type="checkbox" class="form-check-input" id="expandCheckbox">
-                    <label class="form-check-label" for="expandCheckbox">Expand All</label>
-                </div>
-             </div>
-             <div class="text-right">
-              <div class="btn-group">
-                <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
-                  <div class="dropdown-menu dropdown-menu-right">
-                    <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#addCompound"><i class="fa-solid fa-plus mx-2"></i>Add new</a></li>
-                    <li><a class="dropdown-item" id="exportCSV" href="#"><i class="fa-solid fa-file-export mx-2"></i>Export to CSV</a></li>
-                    <li><a class="dropdown-item" id="exportJSON" href="/pages/export.php?format=json&kind=inventory_compounds"><i class="fa-solid fa-file-export mx-2"></i>Export to JSON</a></li>
-                    <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#importJSON"><i class="fa-solid fa-file-import mx-2"></i>Import from JSON</a></li>
-
-                  </div>
-                </div>        
+        <div class="form-inline mb-3">
+           <input type="text" class="form-control mt-2 ml-2" id="btlSize" placeholder="Enter bottle size, eg: 100">
+           <button type="button" class="btn btn-primary" id="submitBottleAmount">Submit</button>
+           <div class="ml-2 mt-2">
+               <input type="checkbox" class="form-check-input" id="expandCheckbox">
+               <label class="form-check-label" for="expandCheckbox">Expand All</label>
+           </div>
+        </div>
+        <div class="text-right">
+           <div class="btn-group">
+               <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
+               <div class="dropdown-menu dropdown-menu-right">
+               <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#addCompound"><i class="fa-solid fa-plus mx-2"></i>Add new</a></li>
+               <li><a class="dropdown-item" id="exportCSV" href="#"><i class="fa-solid fa-file-export mx-2"></i>Export to CSV</a></li>
+               <li><a class="dropdown-item" id="exportJSON" href="/pages/export.php?format=json&kind=inventory_compounds"><i class="fa-solid fa-file-export mx-2"></i>Export to JSON</a></li>
+               <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#importJSON"><i class="fa-solid fa-file-import mx-2"></i>Import from JSON</a></li>
              </div>
-         </tr>
-        </table>
+           </div>
+        </div>
 
-        <table class="table table-bordered" id="tdDataCompounds" width="100%" cellspacing="0">
+        <table class="table table-striped" id="tdDataCompounds" width="100%" cellspacing="0">
           <thead>
             <tr>
               <th>Name</th>
@@ -62,7 +55,6 @@
     </div>
   </div>
 </div>
-</div>
     
 <!-- ADD NEW MODAL-->
 <div class="modal fade" id="addCompound" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="addCompound" aria-hidden="true">
@@ -325,7 +317,7 @@ function docData(data, type, row){
 	
 	function actions(data, type, row){	
 			data = '<div class="dropdown">' +
-			'<button type="button" class="btn btn-primary btn-floating dropdown-toggle hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+			'<button type="button" class="btn btn-floating hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
 				'<ul class="dropdown-menu dropdown-menu-right">';
 			data += '<li><a href="#" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#editCompound" rel="tip" title="Edit '+ row.name +'" data-id='+ row.id +' data-name="'+ row.name +'"><i class="fas fa-edit mx-2"></i>Edit</a></li>';
 			data += '<div class="dropdown-divider"></div>';
diff --git a/pages/customers.php b/pages/customers.php
index 6e1e9d81..9c8c025a 100644
--- a/pages/customers.php
+++ b/pages/customers.php
@@ -23,7 +23,7 @@
                      </div>
                  </tr>
                 </table>
-                <table class="table table-bordered" id="tdDataCustomers" width="100%" cellspacing="0">
+                <table class="table table-striped" id="tdDataCustomers" width="100%" cellspacing="0">
                   <thead>
                     <tr>
                       <th>Name</th>
@@ -180,7 +180,7 @@
 
 function actions(data, type, row){
 		data = '<div class="dropdown">' +
-        '<button type="button" class="btn btn-primary btn-floating dropdown-toggle hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+        '<button type="button" class="btn btn-floating hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
             '<ul class="dropdown-menu dropdown-menu-right">';
 		data += '<li><a href="#" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#editCustomer" rel="tip" title="Edit '+ row.name +'" data-id='+ row.id +' data-name="'+ row.name +'"><i class="fas fa-edit mx-2"></i>Edit</a></li>';
 		data += '<li><a href="'+ row.web +'" class="dropdown-item" target="_blank" rel="tip" title="Open '+ row.name +' page"><i class="fas fa-shopping-cart mx-2"></i>Go to customer</a></li>';
diff --git a/pages/dashboard.php b/pages/dashboard.php
index 67d3ae1b..abcd86a1 100755
--- a/pages/dashboard.php
+++ b/pages/dashboard.php
@@ -19,18 +19,18 @@
 <?php require_once(__ROOT__.'/pages/top.php'); ?>
         <div class="container-fluid">
           <div class="d-sm-flex align-items-center justify-content-between mb-4">
-            <h1 class="m-0 mb-4 text-primary">Dashboard</h1>
+            <h1 class="m-0 mb-4">Dashboard</h1>
           </div>
           <div class="row">
         <?php
 if($ingredientsConf == FALSE){
-	echo '<div class="alert alert-info alert-dismissible"><strong>INFO: </strong> no ingredients yet, click <a href="/?do=ingredients">here</a> to add.</div>';
+	echo '<div class="alert alert-info"><i class="fa-solid fa-circle-exclamation mr-2"></i><strong>No ingredients yet, click <a href="/?do=ingredients">here</a> to add.</strong></div>';
 }elseif($formulasConf == FALSE){
-	echo '<div class="alert alert-info alert-dismissible"><strong>INFO: </strong> no formulas added yet</div>';
+	echo '<div class="alert alert-info"><i class="fa-solid fa-circle-exclamation mr-2"></i><strong>No formulas added yet, click <a href="/?do=listFormulas">here</a> to add.</strong></div>';
 }else{
 		?>
               <div class="dash_charts">
-              <div class="shadow-lg p-3 mb-5 bg-white rounded charts_box">
+              <div class="shadow-lg p-3 mb-5 rounded charts_box">
               
                 <div class="col-md-6">
                 <div class="box" id="formulas-pie">
@@ -72,7 +72,7 @@
                   <div class="row no-gutters align-items-center">
                     <div class="col mr-2">
                       <div class="text-xs font-weight-bold text-primary text-uppercase mb-1"><a href="/?do=listFormulas">All Formulas</a></div>
-                      <div class="h5 mb-0 font-weight-bold text-gray-800"><?php echo countElement("formulasMetaData",$conn); ?></div>
+                      <div class="h5 mb-0 font-weight-bold"><?php echo countElement("formulasMetaData",$conn); ?></div>
                     </div>
                     <div class="col-auto">
                       <i class="fas fa-flask fa-2x text-gray-300"></i>
@@ -88,7 +88,7 @@
                   <div class="row no-gutters align-items-center">
                     <div class="col mr-2">
                       <div class="text-xs font-weight-bold text-warning text-uppercase mb-1"><a href="/?do=suppliers">Suppliers</a></div>
-                      <div class="h5 mb-0 font-weight-bold text-gray-800"><?php echo countElement("ingSuppliers",$conn); ?></div>
+                      <div class="h5 mb-0 font-weight-bold"><?php echo countElement("ingSuppliers",$conn); ?></div>
                     </div>
                     <div class="col-auto">
                       <i class="fas fa-store fa-2x text-gray-300"></i>
@@ -104,7 +104,7 @@
                   <div class="row no-gutters align-items-center">
                     <div class="col mr-2">
                       <div class="text-xs font-weight-bold text-success text-uppercase mb-1"><a href="/?do=IFRA">IFRA Entries</a></div>
-                      <div class="h5 mb-0 font-weight-bold text-gray-800"><?php echo countElement("IFRALibrary",$conn); ?></div>
+                      <div class="h5 mb-0 font-weight-bold"><?php echo countElement("IFRALibrary",$conn); ?></div>
                     </div>
                     <div class="col-auto">
                       <i class="fas fa-university fa-2x text-gray-300"></i>
@@ -120,7 +120,7 @@
                   <div class="row no-gutters align-items-center">
                     <div class="col mr-2">
                       <div class="text-xs font-weight-bold text-info text-uppercase mb-1"><a href="/?do=ingredients">All Ingredients</a></div>
-                      <div class="h5 mb-0 font-weight-bold text-gray-800"><?php echo countElement("ingredients",$conn); ?></div>
+                      <div class="h5 mb-0 font-weight-bold"><?php echo countElement("ingredients",$conn); ?></div>
                     </div>
                     <div class="col-auto">
                       <i class="fas fa-vial fa-2x text-gray-300"></i>
@@ -136,7 +136,7 @@
                   <div class="row no-gutters align-items-center">
                     <div class="col mr-2">
                       <div class="text-xs font-weight-bold text-primary text-uppercase mb-1"><a href="/?do=settings#categories">Categories</a></div>
-                      <div class="h5 mb-0 font-weight-bold text-gray-800"><?php echo countElement("ingCategory",$conn); ?></div>
+                      <div class="h5 mb-0 font-weight-bold"><?php echo countElement("ingCategory",$conn); ?></div>
                     </div>
                     <div class="col-auto">
                       <i class="fas fa-puzzle-piece fa-2x text-gray-300"></i>
@@ -152,7 +152,7 @@
                   <div class="row no-gutters align-items-center">
                     <div class="col mr-2">
                       <div class="text-xs font-weight-bold text-warning text-uppercase mb-1"><a href="/?do=bottles">Bottles</a></div>
-                      <div class="h5 mb-0 font-weight-bold text-gray-800"><?php echo countElement("bottles",$conn); ?></div>
+                      <div class="h5 mb-0 font-weight-bold"><?php echo countElement("bottles",$conn); ?></div>
                     </div>
                     <div class="col-auto">
                       <i class="fas fa-spray-can fa-2x text-gray-300"></i>
@@ -168,7 +168,7 @@
                   <div class="row no-gutters align-items-center">
                     <div class="col mr-2">
                       <div class="text-xs font-weight-bold text-success text-uppercase mb-1"><a href="/?do=lids">Bottle Lids</a></div>
-                      <div class="h5 mb-0 font-weight-bold text-gray-800"><?php echo countElement("lids",$conn); ?></div>
+                      <div class="h5 mb-0 font-weight-bold"><?php echo countElement("lids",$conn); ?></div>
                     </div>
                     <div class="col-auto">
                       <i class="fas fa-prescription-bottle fa-2x text-gray-300"></i>
@@ -184,7 +184,7 @@
                   <div class="row no-gutters align-items-center">
                     <div class="col mr-2">
                       <div class="text-xs font-weight-bold text-info text-uppercase mb-1"><a href="/?do=scheduledFormulas">Formulas to make</a></div>
-                      <div class="h5 mb-0 font-weight-bold text-gray-800"><?php echo countElement("makeFormula WHERE toAdd = '1' GROUP BY name",$conn); ?></div>
+                      <div class="h5 mb-0 font-weight-bold"><?php echo countElement("makeFormula WHERE toAdd = '1' GROUP BY name",$conn); ?></div>
                     </div>
                     <div class="col-auto">
                       <i class="fas fa-flask fa-2x text-gray-300"></i>
diff --git a/pages/editHtmlTmpl.php b/pages/editHtmlTmpl.php
index a2369deb..70569bf8 100644
--- a/pages/editHtmlTmpl.php
+++ b/pages/editHtmlTmpl.php
@@ -73,7 +73,7 @@
             </div>
         </div>
       <div class="dropdown-divider"></div>
-        <div class="alert alert-info"><i class="fa-solid fa-circle-exclamation mr-2"></i>Please refer <a href="https://www.perfumersvault.com/knowledge-base/html-templates/" target="_blank">here</a> for additional special variables syntax</div>
+        <div class="alert alert-info"><i class="fa-solid fa-circle-exclamation mr-2"></i>Please refer <a href="https://www.perfumersvault.com/knowledge-base/html-templates/" target="_blank" class="link-primary">here</a> for additional special variables syntax</div>
          <div class="modal-footer">
           <input type="submit" name="button" class="btn btn-primary" id="tmpl-save" value="Save changes">
       </div>
diff --git a/pages/editUser.php b/pages/editUser.php
index 7d1e9578..5071a877 100755
--- a/pages/editUser.php
+++ b/pages/editUser.php
@@ -26,13 +26,12 @@
       <div class="col-md-4">
         <div class="text-center">
           <div id="profile_pic"><div class="loader"></div></div>
-          <h6>Upload a different photo...</h6>
-          <input type="file" name="avatar" id="avatar" class="form-control">
+          <input type="file" name="avatar" id="avatar" class="mt-2 form-control">
         </div>
         <div class="dropdown-divider"></div>
         <div class="col-xl-12 col-lg-12 col-md-12 col-sm-12 col-12">
 			<div class="text-right">
-        		<input name="upload-avatar" type="submit" class="btn-dark" id="upload-avatar" value="Upload" />
+        		<input name="upload-avatar" type="submit" class="btn btn-secondary mt-2" id="upload-avatar" value="Upload" />
         	</div>
         </div>
       </div>
@@ -60,7 +59,7 @@
           </div>
           <div class="dropdown-divider"></div>
           <div class="form-row">
-			<div class="col-sm-12">
+			<div class="col-sm-auto">
 				<div class="mt-2 text-right">
 					<button type="button" id="save-profile" name="save-profile" class="btn btn-primary">Update</button>
 				</div>
@@ -86,56 +85,56 @@
         }
     });
 
-$('#profile_pic').html('<img class="img-profile-avatar" src="<?=$doc['avatar']?: '/img/logo_def.png'; ?>">');
-
-$('#save-profile').click(function() {
-	$.ajax({ 
-		url: '/pages/update_settings.php', 
-		type: 'POST',
-		data: {
-			update_user_profile: 1,
-			user_fname: $("#fullName").val(),			
-			user_email: $("#email").val(),
-			user_pass: $("#password").val()
-			},
-		dataType: 'json',
-		success: function (data) {
-			if(data.success){
-				var msg = '<div class="alert alert-success">'+data.success+'</div>';
-			}else if( data.error){
-				var msg = '<div class="alert alert-danger">'+data.error+'</div>';
+	$('#profile_pic').html('<img class="img-profile-avatar" src="<?=$doc['avatar']?: '/img/logo_def.png'; ?>">');
+	
+	$('#save-profile').click(function() {
+		$.ajax({ 
+			url: '/pages/update_settings.php', 
+			type: 'POST',
+			data: {
+				update_user_profile: 1,
+				user_fname: $("#fullName").val(),			
+				user_email: $("#email").val(),
+				user_pass: $("#password").val()
+				},
+			dataType: 'json',
+			success: function (data) {
+				if(data.success){
+					var msg = '<div class="alert alert-success">'+data.success+'</div>';
+				}else if( data.error){
+					var msg = '<div class="alert alert-danger">'+data.error+'</div>';
+				}
+				$('#msgU').html(msg);
 			}
-			$('#msgU').html(msg);
+		  });
+	});
+	
+	$('#upload-avatar').click(function() {
+		var fd = new FormData();
+		var files = $('#avatar')[0].files;
+	
+		if(files.length > 0 ){
+			fd.append('avatar',files[0]);
 		}
-	  });
-});
-
-$('#upload-avatar').click(function() {
-	var fd = new FormData();
-    var files = $('#avatar')[0].files;
-
-    if(files.length > 0 ){
-		fd.append('avatar',files[0]);
-	}
-	$.ajax({ 
-		url: '/pages/update_settings.php?update_user_avatar=1', 
-		type: 'POST',
-		data: fd,
-		contentType: false,
-      	processData: false,
-		cache: false,
-		dataType: 'json',
-		success: function (data) {
-			if(data.success){
-				var msg = '<div class="alert alert-success">'+data.success.msg+'</div>';
-				$('#profile_pic').html('<img class="img-profile-avatar" src="'+data.success.avatar+'">');
-
-			}else if( data.error){
-				var msg = '<div class="alert alert-danger">'+data.error+'</div>';
+		$.ajax({ 
+			url: '/pages/update_settings.php?update_user_avatar=1', 
+			type: 'POST',
+			data: fd,
+			contentType: false,
+			processData: false,
+			cache: false,
+			dataType: 'json',
+			success: function (data) {
+				if(data.success){
+					var msg = '<div class="alert alert-success">'+data.success.msg+'</div>';
+					$('#profile_pic').html('<img class="img-profile-avatar" src="'+data.success.avatar+'">');
+	
+				}else if( data.error){
+					var msg = '<div class="alert alert-danger">'+data.error+'</div>';
+				}
+				$('#msgU').html(msg);
 			}
-			$('#msgU').html(msg);
-		}
-	  });
-});
+		  });
+	});
 });
 </script>
\ No newline at end of file
diff --git a/pages/footer.php b/pages/footer.php
index bdbfee44..bc6d410f 100755
--- a/pages/footer.php
+++ b/pages/footer.php
@@ -1,15 +1,15 @@
 <?php if (!defined('pvault_panel')){ die('Not Found');}?>
 
-  <footer class="sticky-footer bg-white">
+  <footer class="sticky-footer">
     <div class="container my-auto">
       <div class="copyright text-center my-auto">
       
-        <span><strong><i class="fa-solid fa-heart mx-2" style="color: #ff0000;"></i><a href="https://www.paypal.com/paypalme/jbparfum" target="_blank" class="pv_point_gen">Donate if you found this useful.
-</a></strong></span>
+        <strong><i class="fa-solid fa-heart mx-2" style="color: #ff0000;"></i><a href="https://www.paypal.com/paypalme/jbparfum" target="_blank" class="pv_point_gen">Donate if you found this useful.
+</a></strong>
 	<hr>
-        <span><strong><a href="https://www.perfumersvault.com" target="_blank"><?php echo $product; ?></a></strong>
+        <strong><a href="https://www.perfumersvault.com" target="_blank"><?php echo $product; ?></a></strong>
         <div id="footer_release" class="pv_point_gen"> Version: <strong><?php echo $ver; ?> | <a href="https://discord.gg/WxNE8kR8ug" target="_blank">Discord Server</a></strong></div>
-        <br />Copyright &copy; 2017-<?php echo date('Y'); ?> </span>
+        <div class="mt-2">Copyright &copy; 2017-<?php echo date('Y'); ?></div>
       </div>
     </div>
   </footer>
diff --git a/pages/formula.php b/pages/formula.php
index ee59f7c0..a156c0f8 100755
--- a/pages/formula.php
+++ b/pages/formula.php
@@ -54,23 +54,23 @@
             
                 <div class="d-flex w-100">
                   <div class="flex-grow-1 text-start" style="width: 75%;">
-                    <h2 class="m-0 fw-bold text-primary">
-                      <a href="javascript:reload_formula_data()">
-                        <div id="formula_name"><?= $f_name ?: 'Unnamed' ?></div>
+                    <h2 class="m-0 fw-bold text-body">
+                      <a href="#">
+                        <div id="formula_name" class="text-body-emphasis"><?=$f_name ?: 'Unnamed' ?></div>
                       </a>
                       <span class="m-1">
                         <div id="lock_status">
                           <?php if ($meta['isProtected']) { ?>
-                            <a class="fas fa-lock" href="javascript:setProtected('false')"></a>
+                            <a class="fas fa-lock text-body-emphasis" href="javascript:setProtected('false')"></a>
                           <?php } else { ?>
-                            <a class="fas fa-unlock" href="javascript:setProtected('true')"></a>
+                            <a class="fas fa-unlock text-body-emphasis" href="javascript:setProtected('true')"></a>
                           <?php } ?>
                         </div>
                       </span>
                     </h2>
                     <h5 class="m-1 text-primary">
                       <span>
-                        <a href="#" rel="tip" data-bs-placement="right" title="<?= $cat_details['description'] ?>">
+                        <a href="#" rel="tip" class="text-secondary-emphasis"" data-bs-placement="right" title="<?= $cat_details['description'] ?>">
                           <?= ucfirst($meta['catClass']) ?>
                         </a>
                       </span>
@@ -253,6 +253,10 @@
 var myFID = "<?=$fid?>";
 var isProtected = "<?=$meta['isProtected']?>"
 
+$('#formula_name').click(function() {
+    reload_formula_data();
+});
+    
 $('#add_ing').hide();
 
 if(isProtected == '0'){
@@ -279,7 +283,7 @@
 			dilutant: $("#dilutant").val(),			
 			reCalc: $("#reCalcAdd").prop('checked'),
 			formulaSolventID: $("#formulaSolventsAdd").val()
-			},
+		},
 		dataType: 'json',
 		success: function (data) {
 			if ( data.success ) {
@@ -302,7 +306,7 @@ function setProtected(status) {
 		url: '/pages/update_data.php', 
 		type: 'GET',
 		data: {
-			protect: '<?=$fid?>',
+			protect: myFID,
 			isProtected: status,
 			},
 		dataType: 'json',
@@ -310,10 +314,10 @@ function setProtected(status) {
 			if ( data.success ) {
 				fetch_formula();
 				if( data.success == 'Formula locked'){
-					$('#lock_status').html('<a class="fas fa-lock" href="javascript:setProtected(\'false\')">');
+					$('#lock_status').html('<a class="fas fa-lock text-body-emphasis" href="javascript:setProtected(\'false\')">');
 					$('#add_ing').hide();
 				}else{
-					$('#lock_status').html('<a class="fas fa-unlock" href="javascript:setProtected(\'true\')">');
+					$('#lock_status').html('<a class="fas fa-unlock text-body-emphasis" href="javascript:setProtected(\'true\')">');
 					$('#add_ing').show();
 				}
 			} else {
@@ -346,8 +350,8 @@ function fetch_pyramid(){
 		type: 'GET',
 		data: {
 			formula: "<?=$id?>",
-			fid: "<?=$fid?>"
-			},
+			fid: myFID
+		},
 		dataType: 'html',
 		success: function (data) {
 		  $('#fetch_pyramid').html(data);
@@ -361,8 +365,8 @@ function fetch_impact(){
 		url: '/pages/views/formula/impact.php', 
 		type: 'GET',
 		data: {
-			id: "<?php echo $fid; ?>"
-			},
+			id: myFID
+		},
 		dataType: 'html',
 		success: function (data) {
 		  $('#fetch_impact').html(data);
@@ -376,7 +380,7 @@ function fetch_analysis(){
 		url: '/pages/views/formula/analysis.php', 
 		type: 'GET',
 		data: {
-			fid: "<?php echo $fid; ?>"
+			fid: myFID
 		},
 		dataType: 'html',
 		success: function (data) {
@@ -390,7 +394,7 @@ function fetch_summary(){
     url: '/pages/viewSummary.php', 
 	type: 'GET',
     data: {
-		id: "<?=$fid?>"
+		id: myFID
 	},
 	dataType: 'html',
 		success: function (data) {
@@ -407,7 +411,7 @@ function fetch_replacements(){
 		url: '/pages/views/formula/replacements.php', 
 		type: 'POST',
 		data: {
-			fid: "<?=$fid?>"
+			fid: myFID
 		},
 		dataType: 'html',
 		success: function (data) {
@@ -435,7 +439,7 @@ function fetch_revisions(){
 		url: '/pages/views/formula/revisions.php', 
 		type: 'GET',
 		data: {
-			fid: "<?=$fid?>",
+			fid: myFID,
 			id: "<?=$meta['id']?>"
 		},
 		dataType: 'html',
diff --git a/pages/genFinishedProduct.php b/pages/genFinishedProduct.php
index 34fd44d6..59c478ce 100644
--- a/pages/genFinishedProduct.php
+++ b/pages/genFinishedProduct.php
@@ -1,513 +1,177 @@
+<div id="content-wrapper" class="d-flex flex-column">
+<?php require_once(__ROOT__.'/pages/top.php'); ?>
+<div class="container-fluid">
+  <div class="card shadow mb-4">
+        <div class="card-header py-3"> 
+           <h2 class="m-0 font-weight-bold text-primary-emphasis">Finished Product</h2>
+    	</div>
+		<div class="card-body">
 <?php 
 if (!defined('pvault_panel')){ die('Not Found');}
 
-require_once(__ROOT__.'/libs/fpdf.php');
-require_once(__ROOT__.'/func/genBatchID.php');
-require_once(__ROOT__.'/func/genBatchPDF.php');
-require_once(__ROOT__.'/func/validateFormula.php');
-require_once(__ROOT__.'/func/calcPerc.php');
-require_once(__ROOT__.'/func/calcCosts.php');
-
-if($_POST['formula']){
-	$fid = mysqli_real_escape_string($conn, $_POST['formula']);
-	$meta = mysqli_fetch_array(mysqli_query($conn, "SELECT * FROM formulasMetaData WHERE fid = '$fid'"));
-	$f_name = $meta['name'];
-	
-	$formula_q = mysqli_query($conn, "SELECT * FROM formulas WHERE fid = '$fid' ORDER BY ingredient ASC");
-	while ($formula = mysqli_fetch_array($formula_q)){
-	    $form[] = $formula;
+	if(!mysqli_num_rows(mysqli_query($conn, "SELECT id FROM formulasMetaData"))){
+		echo '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>You need to <a href="/?do=listFormulas">create</a> at least one formula before you be able to generate a finished product</div>';
+		return;
 	}
-	$mg = mysqli_fetch_assoc(mysqli_query($conn, "SELECT SUM(quantity) AS total_mg FROM formulas WHERE fid = '$fid'"));
-	
-	$bottle = mysqli_real_escape_string($conn, $_POST['bottle']);
-	$type = mysqli_real_escape_string($conn, $_POST['type']);
-	$carrier_id = mysqli_real_escape_string($conn, $_POST['carrier']);
-	$lid_id = mysqli_real_escape_string($conn, $_POST['lid']);
-	$bottle_cost = mysqli_fetch_array(mysqli_query($conn, "SELECT price,ml,name FROM bottles WHERE id = '$bottle' AND price != 0 "));
-	
-	$carrier_cost = mysqli_fetch_array(mysqli_query($conn, "SELECT price,size FROM suppliers WHERE ingID = '$carrier_id'"));
-	
-	$defCatClass = mysqli_real_escape_string($conn, $_POST['defCatClass']);
-
-	if(empty($defCatClass)){
-		$defCatClass = $settings['defCatClass'];
+	if(!mysqli_num_rows(mysqli_query($conn, "SELECT id FROM bottles"))){
+		echo '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>You need to <a href="/?do=bottles">add</a> at least one bottle in your inventory first</div>';
+		return;
 	}
-	
-	if($_POST['lid']){
-		$lid_cost = mysqli_fetch_array(mysqli_query($conn, "SELECT  price,style FROM lids WHERE id = '$lid_id'"));
-	}else{
-		$lid_cost['price'] = 0;
-		$lid_cost['style'] = 'none';
+	if(!mysqli_num_rows(mysqli_query($conn, "SELECT id FROM ingredients WHERE type = 'Carrier' OR type = 'Solvent'"))){
+		echo '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>You need to <a href="/?do=ingredients">add</a> at least one solvent or carrier first</div>';
+		return;
 	}
 	
-	$bottle = $bottle_cost['ml'];
-	$new_conc = $bottle/100*$type;
-	$carrier = $bottle - $new_conc;
-	
-	if(validateFormula($meta['fid'], $bottle, $new_conc, $mg['total_mg'], $defCatClass, $settings['qStep'], $conn) == TRUE){
-		$msg =  '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>Your formula contains materials, exceeding and/or missing IFRA standards. Please alter your formula</div>';
+	$cats_q = mysqli_query($conn, "SELECT name,description FROM IFRACategories ORDER BY id ASC");
+	while($cats_res = mysqli_fetch_array($cats_q)){
+		$cats[] = $cats_res;
 	}
-	
-	if($_POST['ingSup']){
-		$sid = $_POST['ingSup'];
+	$sup_q = mysqli_query($conn, "SELECT id,name FROM ingSuppliers ORDER BY id ASC");
+	while($r = mysqli_fetch_array($sup_q)){
+		$suppliers[] = $r;
+	}
+	$fTypes_q = mysqli_query($conn, "SELECT id,name,description,concentration FROM perfumeTypes ORDER BY id ASC");
+		while($fTypes_res = mysqli_fetch_array($fTypes_q)){
+		$fTypes[] = $fTypes_res;
 	}
-
-if($_POST['batchID'] == '1'){
-
-	define('FPDF_FONTPATH',__ROOT__.'/fonts');
-	$batchID = genBatchID();
-	
-	genBatchPDF($fid,$batchID,$bottle,$new_conc,$mg['total_mg'],$defCatClass,$settings['qStep'], $settings['defPercentage']);
-	
-}else{
-	$batchID = 'N/A';
-}
-	
 ?>
-    
-
-<?php } ?>
-
-<div id="content-wrapper" class="d-flex flex-column">
-<?php require_once(__ROOT__.'/pages/top.php'); ?>
-        <div class="container-fluid">
-		<div>
-          <div class="card shadow mb-4">
-            <div class="card-header py-3"> 
-            <?php if($_GET['generate'] && $_POST['formula']){?>
-             <h2 class="m-0 font-weight-bold text-primary"><a href="#"><?php echo $meta['product_name'];?></a></h2>
-             <h5 class="m-1 text-primary">Formula name: <strong><?php echo $meta['name'];?></strong></h5>
-             <h5 class="m-1 text-primary">Bottle: <strong><?php echo $bottle; ?><?=$settings['mUnit']?></strong></h5>
-			 <h5 class="m-1 text-primary">Concentration: <strong><?php echo $type; ?>%</h5>
-     		 <h5 class="m-1 text-primary">Batch ID: <?php if($_POST['batchID'] == '1'){ echo '<a href="/pages/viewDoc.php?type=batch&id='.$batchID.'" target="_blank">'.$batchID.'</a>'; }else{ echo 'N/A';}?></h5>
-             <h5 class="m-1 text-primary">Category Class: <strong><?php echo ucfirst($defCatClass);?></strong></h5>
-             <?php if($sid){?>
-             <h5 class="m-1 text-primary">Supplier: <strong><?=getSupplierByID($sid,$conn)['name']?></strong></h5>
-             <?php } ?>
-        	<?php }else{ ?>
-              <h2 class="m-0 font-weight-bold text-primary"><a href="/?do=genFinishedProduct">Generate Finished Product</a></h2>
-            <?php } ?>
-            </div>
-            <div class="card-body">
-           <div id="inf"><?php if($msg){ echo $msg; }?></div>
-            <?php if($_GET['generate'] && $_POST['formula']){?>
-              <div>
-                <table class="table table-bordered" id="formula" width="100%" cellspacing="0">
-                  <thead>
-                    <tr class="noexport">
-                      <th colspan="8">
-                     <div class="text-right">
-                      <div class="btn-group">
-                      <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
-                      <div class="dropdown-menu dropdown-menu-left">
-                        <li><a class="dropdown-item" id="pdf" href="#"><i class="fa-solid fa-file-pdf mx-2"></i>Export to PDF</a></li>
-                        <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#IFRA"><i class="fa-solid fa-certificate mx-2"></i>IFRA Document</a></li>
-                        <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#ViewBoxLabel"><i class="fa-solid fa-font mx-2"></i>View Box Back Label</a></li>
-                      </div>
-                    </div>
-                    </div>
-                    </th>
-                    </tr>
-                    <tr>
-                      <th>Ingredient</th>
-                      <th>CAS#</th>
-                      <th>Quantity (<?=$settings['mUnit']?>)</th>
-                      <th>Concentration%</th>
-                      <th>Cost (<?php echo utf8_encode($settings['currency']);?>)</th>
-                    </tr>
-                  </thead>
-                  <?php foreach ($form as $formula){
-					    $ing_q = mysqli_fetch_array(mysqli_query($conn, "SELECT id,cas,$defCatClass,byPassIFRA FROM ingredients WHERE name = '".$formula['ingredient']."'"));
-
-						$limit = explode(' - ',searchIFRA($ing_q['cas'],$formula['ingredient'],null,$defCatClass));
-					  
-					    $new_quantity = $formula['quantity']/$mg['total_mg']*$new_conc;
-					  	$conc = $new_quantity/$bottle * 100;						
-					  	$conc_p = number_format($formula['concentration'] / 100 * $conc, $settings['qStep']);
-					 	
-						if($settings['multi_dim_perc'] == '1'){
-							$conc_p   += multi_dim_perc($conn, $form, $ing_q['cas'], $settings['qStep'], $settings['defPercentage'])[$ing_q['cas']];
-						}
-					?>
-					  <tr>
-                      <td align="center"><?=$formula['ingredient']?></td>
-					  <td align="center"><?=$ing_q['cas']?></td>					
-					 <?php
-                      
-					  if($limit['0'] != null && $ing_q['byPassIFRA'] == 0){
-						 if($limit['0'] < $conc_p){
-							$IFRA_WARN = 'class="alert-danger"';//VALUE IS TO HIGH AGAINST IFRA
-					  	}else{
-							$IFRA_WARN = 'class="alert-success"'; //VALUE IS OK
-						}
-					  }else
-					  if($ing_q[$defCatClass] != null){
-					  	if($ing_q[$defCatClass] < $conc_p){
-							$IFRA_WARN = 'class="alert-info"'; //VALUE IS TO HIGH AGAINST LOCAL DB
-					  	}else{
-							$IFRA_WARN = 'class="alert-success"'; //VALUE IS OK
-						}
-					  }else{
-						  $IFRA_WARN = 'class="alert-warning"'; //NO RECORD FOUND
-					  }
-					  ?>
-					  <td align="center"><?=number_format($new_quantity, $settings['qStep'])?></td>
-					  <td align="center" <?=$IFRA_WARN?>><?=$conc_p?>%</td>
-                      <?php if($sid){ ?>
-					  	<td align="center"><?=calcCosts(getSingleSupplier($sid,$ing_q['id'],$conn)['price'],$new_quantity, $formula['concentration'], getPrefSupplier($ing_q['id'],$conn)['size']);?></td>
-					  <?php }else{ ?>
-					  	<td align="center"><?=calcCosts(getPrefSupplier($ing_q['id'],$conn)['price'],$new_quantity, $formula['concentration'], getPrefSupplier($ing_q['id'],$conn)['size']);?></td>
-                      <?php } ?>
-                    </tr>
-					<?php
-						if($sid){
-                    		$tot[] = calcCosts(getSingleSupplier($sid,$ing_q['id'],$conn)['price'],$new_quantity, $formula['concentration'], getPrefSupplier($ing_q['id'],$conn)['size']);
-						}else{
-						   	$tot[] = calcCosts(getPrefSupplier($ing_q['id'],$conn)['price'],$new_quantity, $formula['concentration'], getPrefSupplier($ing_q['id'],$conn)['size']);
-						}
-						
-						$conc_tot[] = $conc_p;
-						$new_tot[] = $new_quantity;
-				  	}
-                  	?>
-                    </tr>
-                    <tr>
-                      <td></td>
-                      <td align="center" class="m-1 text-primary">Sub Total: </td>
-                      <td align="center" class="m-1 text-primary"><?php echo number_format(array_sum($new_tot), $settings['qStep']); ?> <?=$settings['mUnit']?></td>
-                      <td align="center" class="m-1 text-primary"><?php echo array_sum($conc_tot);?>%</td>
-                      <td colspan="2" align="center" class="m-1 text-primary"><?php echo utf8_encode($settings['currency']).number_format(array_sum($tot),$settings['qStep']);?></td>
-                    </tr>
-                    <tr>
-                      <td></td>
-                      <td align="center" class="m-1 text-primary">Carrier/Solvent: </td>
-                      <td align="center" class="m-1 text-primary"><?php echo $carrier; ?> <?=$settings['mUnit']?></td>
-                      <td align="center" class="m-1 text-primary"><?php echo $carrier*100/$bottle;?>%</td>
-                      <td colspan="2" align="center" class="m-1 text-primary"><?php $carrier_sub_cost = $carrier_cost['price'] / $carrier_cost['size'] * $carrier; echo utf8_encode($settings['currency']).number_format($carrier_sub_cost, $settings['qStep']);?></td>
-                    </tr>
-                    <tr>
-                      <td></td>
-                      <td align="center" class="m-0 text-primary">Bottle:</td>
-                      <td align="center" class="m-0 text-primary"><?php echo $bottle_cost['ml'];?> <?=$settings['mUnit']?></td>
-                      <td align="center" class="m-0 text-primary">-</td>
-                      <td colspan="2" align="center" class="m-0 text-primary"><?php echo  utf8_encode($settings['currency']).$bottle_cost['price']; ?></td>
-                    </tr>
-                    <tr>
-                      <td></td>
-                      <td align="center" class="m-0 text-primary">Lid:</td>
-                      <td align="center" class="m-0 text-primary"><?php echo $lid_cost['style'];?></td>
-                      <td align="center" class="m-0 text-primary">-</td>
-                      <td colspan="2" align="center" class="m-0 text-primary"><?php echo $settings['currency'].$lid_cost['price'];?></td>
-                    </tr>
-                    <tr>
-                      <td></td>
-                      <td align="center" class="m-0 text-primary">Batch No:</td>
-                      <td align="center" class="m-0 text-primary"><?php echo $meta['batchNo'];?></td>
-                      <td align="center" class="m-0 text-primary">-</td>
-                      <td colspan="2" align="center" class="m-0 text-primary">-</td>
-                    </tr>
-                    <tr>
-                      <td></td>
-                      <td align="center" class="m-0 font-weight-bold text-primary">Total: </td>
-                      <td width="15%" align="center" class="m-0 font-weight-bold text-primary"><?php echo number_format(array_sum($new_tot)+ $carrier, $settings['qStep']); ?> <?=$settings['mUnit']?></td>
-                      <td width="15%" align="center" class="m-0 font-weight-bold text-primary"><?php echo $carrier*100/$bottle + array_sum($conc_tot); ?>%</td>
-                      <td colspan="2" align="center" class="m-0 font-weight-bold text-primary"><?php echo $settings['currency'].number_format(array_sum($tot)+$lid_cost['price']+$carrier_sub_cost+$bottle_cost['price'],$settings['qStep']);?></td>
-                    </tr>
-                  </tfoot>                                    
-                </table> 
-          		<div class="mt-4 mb-4 dropdown-divider"></div>
-           		<p>*Values in: <strong class="alert alert-danger mx-2">red</strong> exceeds usage level, <strong class="alert bg-banned mx-2">dark red</strong> banned/prohibited, <strong class="alert alert-warning mx-2">yellow</strong> Specification,<strong class="alert alert-success mx-2">green</strong> are within usage level,<strong class="alert alert-info mx-2">blue</strong> are exceeding recommended usage level</p>
-
-
-<!--VIEW BOX LABEL MODAL-->            
-<div class="modal fade" id="ViewBoxLabel" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="ViewBoxLabel" aria-hidden="true">
-  <div class="modal-dialog modal-lg" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title mgmIngHeader mgmIngHeader-with-separator" id="headerLabel">View Label</h5>
-        <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body">
-        <div class="alert alert-info"><i class="fa-solid fa-circle-info mx-2"></i>Loading...</div>
-      </div>
-    </div>
-  </div>
-</div>
-
-
-<!-- Modal IFRA DOC-->
-<div class="modal fade" id="IFRA" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="IFRA" aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">Generate IFRA Document</h5>
-      </div>
-      <div class="modal-body">
-      <div class="alert alert-info"><i class="fa-solid fa-circle-exclamation mr-2"></i>IMPORTANT: The generated document isn't an official IFRA certificate and needs to be reviewed by a certified person. Also, data needs to be properly verified to make sure there are no errors.</div>
-
-	  <div class="mb-3">
-  		<label for="customer" class="form-label">Select customer</label>
-        <select class="form-control" name="customer" id="customer">
-            <?php
-				$res = mysqli_query($conn, "SELECT id, name FROM customers ORDER BY name ASC");
-				while ($q = mysqli_fetch_array($res)){
-				echo '<option value="'.$q['id'].'">'.$q['name'].'</option>';
-			}
-			?>
-        </select>
-       </div>
-	   <div class="mb-3">
-  			<label for="template" class="form-label">Select IFRA document template</label>
-            <select class="form-control" name="template" id="template">
-            <?php
-				$res = mysqli_query($conn, "SELECT id, name FROM templates ORDER BY name ASC");
-				while ($q = mysqli_fetch_array($res)){
-				echo '<option value="'.$q['id'].'">'.$q['name'].'</option>';
-			}
-			?>
-            </select>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-        <input type="submit" class="btn btn-primary" id="generateDoc" value="Generate">
-      </div>
-    </div>
-  </div>
-</div>
-            <?php 
-			}else{ 
-				if(mysqli_num_rows(mysqli_query($conn, "SELECT id FROM formulasMetaData"))== 0){
-					echo '<div class="alert alert-info"><strong>INFO: </strong> You need to <a href="/?do=listFormulas">create</a> at least one formula first.</div>';
-					return;
-				}
-				if(mysqli_num_rows(mysqli_query($conn, "SELECT id FROM bottles"))== 0){
-					echo '<div class="alert alert-info"><strong>INFO: </strong> You need to <a href="/?do=bottles">add</a> at least one bottle in your inventory first.</div>';
-					return;
-				}
-				if(mysqli_num_rows(mysqli_query($conn, "SELECT id FROM ingredients WHERE type = 'Carrier' OR type = 'Solvent'"))== 0){
-					echo '<div class="alert alert-info"><strong>INFO: </strong> You need to <a href="/?do=ingredients">add</a> at least one solvent or carrier first.</div>';
-					return;
-				}
-				
-				$cats_q = mysqli_query($conn, "SELECT name,description FROM IFRACategories ORDER BY id ASC");
-				while($cats_res = mysqli_fetch_array($cats_q)){
-					$cats[] = $cats_res;
-				}
-				$sup_q = mysqli_query($conn, "SELECT id,name FROM ingSuppliers ORDER BY id ASC");
-				while($r = mysqli_fetch_array($sup_q)){
-					$suppliers[] = $r;
-				}
-				$fTypes_q = mysqli_query($conn, "SELECT id,name,description,concentration FROM perfumeTypes ORDER BY id ASC");
-					while($fTypes_res = mysqli_fetch_array($fTypes_q)){
-   					$fTypes[] = $fTypes_res;
-				}
-			?>
-<form action="/?do=genFinishedProduct&generate=1" method="POST" target="_blank">
            
-  <div class="row mb-3">
-    <label for="formula" class="col-sm-1 col-form-label">Formula</label>
-    <div class="col-sm-5">
-      <select name="formula" id="formula" class="form-control selectpicker" data-live-search="true">
-        <?php
-          $sql = mysqli_query($conn, "SELECT fid,name,product_name FROM formulasMetaData WHERE product_name IS NOT NULL ORDER BY name ASC");
-          while ($formula = mysqli_fetch_array($sql)){
-            echo '<option value="'.$formula['fid'].'">'.$formula['name'].' ('.$formula['product_name'].')</option>';
-          }
-        ?>
-      </select>
-    </div>
-  </div>
-  <div class="row mb-3">
-    <label for="type" class="col-sm-1 col-form-label">Concentration</label>
-    <div class="col-sm-5">
-      <select name="type" id="type" class="form-control selectpicker" data-live-search="true">
-        <option value="100">Concentrated (100%)</option>
-        <?php foreach ($fTypes as $fType) {?>
-          <option value="<?php echo $fType['concentration'];?>" <?php echo ($info['finalType']==$fType['concentration'])?"selected=\"selected\"":""; ?>><?php echo $fType['name'].' ('.$fType['concentration'];?>%)</option>
-        <?php } ?>
-      </select>
-    </div>
-  </div>
-  <div class="row mb-3">
-    <label for="ingSup" class="col-sm-1 col-form-label">Ingredients Supplier</label>
-    <div class="col-sm-5">
-      <select name="ingSup" id="ingSup" class="form-control selectpicker" data-live-search="true">
-        <option value="0" selected="selected">Formula Defaults</option>
-        <?php foreach ($suppliers as $supplier) {?>
-          <option value="<?=$supplier['id'];?>"><?=$supplier['name'];?></option>
-        <?php } ?>
-      </select>
-    </div>
-  </div>
-  <div class="row mb-3">
-    <label for="defCatClass" class="col-sm-1 col-form-label">Category Class</label>
-    <div class="col-sm-5">
-      <select name="defCatClass" id="defCatClass" class="form-control selectpicker" data-live-search="true">
-        <?php foreach ($cats as $IFRACategories) {?>
-          <option value="cat<?php echo $IFRACategories['name'];?>" <?php echo ($settings['defCatClass']=='cat'.$IFRACategories['name'])?"selected=\"selected\"":""; ?>><?php echo 'Cat '.$IFRACategories['name'].' - '.$IFRACategories['description'];?></option>
-        <?php } ?>
-      </select>
-    </div>
-  </div>
-  <div class="row mb-3">
-    <label for="batchID" class="col-sm-1 col-form-label">Batch ID</label>
-    <div class="col-sm-5">
-      <select name="batchID" id="batchID" class="form-control selectpicker" data-live-search="false">
-        <option value="0">Do Not Generate</option>
-        <option value="1">Generate</option>
-      </select>
-    </div>
-  </div>
-  <div class="row mb-3">
-    <label for="bottle" class="col-sm-1 col-form-label">Bottle</label>
-    <div class="col-sm-5">
-      <select name="bottle" id="bottle" class="form-control selectpicker" data-live-search="true">
-        <?php
-          $sql = mysqli_query($conn, "SELECT id,name,ml FROM bottles WHERE ml != 0 ORDER BY ml DESC");
-          while ($bottle = mysqli_fetch_array($sql)){
-            echo '<option value="'.$bottle['id'].'">'.$bottle['name'].' ('.$bottle['ml'].'ml)</option>';
-          }
-        ?>
-      </select>
-    </div>
-  </div>
-  <div class="row mb-3">
-    <label for="carrier" class="col-sm-1 col-form-label">Carrier</label>
-    <div class="col-sm-5">
-      <select name="carrier" id="carrier" class="form-control selectpicker" data-live-search="true">
-        <?php
-          $sql = mysqli_query($conn, "SELECT name,id FROM ingredients WHERE type = 'Carrier' OR type = 'Solvent' ORDER BY name ASC");
-          while ($carrier = mysqli_fetch_array($sql)){
-            echo '<option value="'.$carrier['id'].'">'.$carrier['name'].'</option>';
-          }
-        ?>
-      </select>
-    </div>
-  </div>
-  <div class="row mb-3">
-    <label for="lid" class="col-sm-1 col-form-label">Bottle Lid</label>
-    <div class="col-sm-5">
-      <select name="lid" id="lid" class="form-control selectpicker" data-live-search="true">
-        <option value="0" selected="selected">None</option>
-        <?php
-          $sql = mysqli_query($conn, "SELECT style,id FROM lids ORDER BY style ASC");
-          while ($lid = mysqli_fetch_array($sql)){
-            echo '<option value="'.$lid['id'].'">'.$lid['style'].'</option>';
-          }
-        ?>
-      </select>
-    </div>
-  </div>
-  <div class="row mb-3">
-    <div class="col-sm-5">
-      <input type="submit" name="button" class="btn btn-primary" id="button" value="Generate">
-    </div>
-  </div>
-</form>
-
-            <?php } ?>
-           </div>
+        <div class="row mb-3">
+          <div class="col-md-6">
+            <label for="formulaID" class="col-form-label">Formula</label>
+            <div>
+              <select name="formulaID" id="formulaID" class="form-control selectpicker" data-live-search="true">
+                <?php
+                  $sql = mysqli_query($conn, "SELECT id,fid,name,product_name FROM formulasMetaData WHERE product_name IS NOT NULL ORDER BY name ASC");
+                  while ($formula = mysqli_fetch_array($sql)){
+                    echo '<option value="'.$formula['id'].'">'.$formula['name'].' ('.$formula['product_name'].')</option>';
+                  }
+                ?>
+              </select>
+            </div>
+          </div>
+          <div class="col-md-6">
+            <label for="concentration" class="col-form-label">Concentration</label>
+            <div>
+              <select name="concentration" id="concentration" class="form-control selectpicker" data-live-search="true">
+                <option value="100">Concentrated (100%)</option>
+                <?php foreach ($fTypes as $fType) {?>
+                  <option value="<?php echo $fType['concentration'];?>" <?php echo ($info['finalType']==$fType['concentration'])?"selected=\"selected\"":""; ?>><?php echo $fType['name'].' ('.$fType['concentration'];?>%)</option>
+                <?php } ?>
+              </select>
+            </div>
+          </div>
         </div>
+        
+        <div class="row mb-3">
+          <div class="col-md-6">
+            <label for="supplier_id" class="col-form-label">Ingredients Supplier</label>
+            <div>
+              <select name="supplier_id" id="supplier_id" class="form-control selectpicker" data-live-search="true">
+                <option value="0" selected="selected">Formula Defaults</option>
+                <?php foreach ($suppliers as $supplier) {?>
+                  <option value="<?=$supplier['id'];?>"><?=$supplier['name'];?></option>
+                <?php } ?>
+              </select>
+            </div>
+          </div>
+          <div class="col-md-6">
+            <label for="defCatClass" class="col-form-label">Category Class</label>
+            <div>
+              <select name="defCatClass" id="defCatClass" class="form-control selectpicker" data-live-search="true">
+                <?php foreach ($cats as $IFRACategories) {?>
+                  <option value="cat<?php echo $IFRACategories['name'];?>" <?php echo ($settings['defCatClass']=='cat'.$IFRACategories['name'])?"selected=\"selected\"":""; ?>><?php echo 'Cat '.$IFRACategories['name'].' - '.$IFRACategories['description'];?></option>
+                <?php } ?>
+              </select>
+            </div>
+          </div>
+        </div>
+        
+        <div class="row mb-3">
+          <div class="col-md-6">
+            <label for="batch_id" class="col-form-label">Batch ID</label>
+            <div>
+              <select name="batch_id" id="batch_id" class="form-control selectpicker" data-live-search="false">
+                <option value="0">Do Not Generate</option>
+                <option value="1">Generate</option>
+              </select>
+            </div>
+          </div>
+          <div class="col-md-6">
+            <label for="bottle_id" class="col-form-label">Bottle</label>
+            <div>
+              <select name="bottle_id" id="bottle_id" class="form-control selectpicker" data-live-search="true">
+                <?php
+                  $sql = mysqli_query($conn, "SELECT id,name,ml FROM bottles WHERE ml != 0 ORDER BY ml DESC");
+                  while ($bottle = mysqli_fetch_array($sql)){
+                    echo '<option value="'.$bottle['id'].'">'.$bottle['name'].' ('.$bottle['ml'].'ml)</option>';
+                  }
+                ?>
+              </select>
+            </div>
+          </div>
+        </div>
+        
+        <div class="row mb-3">
+          <div class="col-md-6">
+            <label for="carrier_id" class="col-form-label">Carrier</label>
+            <div>
+              <select name="carrier_id" id="carrier_id" class="form-control selectpicker" data-live-search="true">
+                <?php
+                  $sql = mysqli_query($conn, "SELECT name,id FROM ingredients WHERE type = 'Carrier' OR type = 'Solvent' ORDER BY name ASC");
+                  while ($carrier = mysqli_fetch_array($sql)){
+                    echo '<option value="'.$carrier['id'].'">'.$carrier['name'].'</option>';
+                  }
+                ?>
+              </select>
+            </div>
+          </div>
+          <div class="col-md-6">
+            <label for="lid" class="col-form-label">Bottle Lid</label>
+            <div>
+              <select name="lid_id" id="lid_id" class="form-control selectpicker" data-live-search="true">
+                <option value="0" selected="selected">None</option>
+                <?php
+                  $sql = mysqli_query($conn, "SELECT style,id FROM lids ORDER BY style ASC");
+                  while ($lid = mysqli_fetch_array($sql)){
+                    echo '<option value="'.$lid['id'].'">'.$lid['style'].'</option>';
+                  }
+                ?>
+              </select>
+            </div>
+          </div>
+        </div>
+        <div class="row mb-3">
+          <div class="col-sm-5">
+            <input type="submit" name="button" class="btn btn-primary" id="btnGEN" value="Generate">
+          </div>
+        </div>
+
       </div>
-   </div>
-  </div>
-  
-  <!-- Modal IFRA Doc -->
-  <div class="modal fade" id="ifraDocModal" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="ifraDocModalLabel" aria-hidden="true">
-  <div class="modal-dialog odal-dialog-scrollable modal-fullscreen" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title" id="ifraDocModalLabel">IFRA Document</h5>
-        <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
-          <span aria-hidden="true">&times;</span>
-        </button>
-      </div>
-      <div class="modal-body modal-IFRA-body-data">
-        Loading...
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary" id="printIFRADoc">Print<i class="fa-solid fa-arrow-up-right-from-square ml-2"></i></button>
-      </div>
+     </div>
     </div>
+   <div id="results"></div>
   </div>
-</div>
-<script type="text/javascript" language="javascript" >
-$("#ViewBoxLabel").on("show.bs.modal", function(e) {
-	
-  const action = "viewBoxLabel"; 
-  const batchID = "<?php echo $batchID; ?>";
-  const formula = "<?php echo $fid; ?>";
-  const carrier = "<?php echo $carrier*100/$bottle;?>";
-
-  const url = "/pages/manageFormula.php?action="+ action + "&batchID=" + batchID +"&fid=" + formula + "&carrier=" + carrier +"&download=text";
-
-  $.get(url)
-    .then(data => {
-      $("#headerLabel", this).html("<?php echo $f_name; ?>");
-      $(".modal-body", this).html(data);
-    });
-	
-});
-
-$('#generateDoc').click(function() {
-	$('.modal-IFRA-body-data').html('loading');
-	$.ajax({
-	   type: 'POST',
-	   url: '/pages/views/IFRA/genIFRAdoc.php',
-	   data:{
-		   fid: "<?=$meta['fid']?>",
-		   conc: "<?=$type?>",
-		   bottle: "<?=$bottle?>",
-		   defCatClass: "<?=$defCatClass?>",
-		   template: $("#template").val(),
-		   customer: $("#customer").val()
-	   },
-	   success: function(data) {
-			$('.modal-IFRA-body-data').html(data);
-			$('#ifraDocModal').modal('show'); 
-	   },
-	   error:function(err){
-			data = '<div class="alert alert-danger">Unable to generate data</div>';
-			$('.modal-IFRA-body-data').html(data);
-			$('#ifraDocModal').modal('show'); 
-	   }
-	})
- });
-	 
-	 
-$('#printIFRADoc').click(function() {
-    var printContents = $('.modal-IFRA-body-data').html();
-    var printWindow = window.open('', '_blank', 'width=800,height=600');
-    
-    printWindow.document.open();
-    printWindow.document.write('<html><head><title>Print</title>');
-    printWindow.document.write('</head><body>');
-    printWindow.document.write(printContents);
-    printWindow.document.write('</body></html>');
-    printWindow.document.close();
-
-    printWindow.focus();
-    printWindow.print();
-    printWindow.close();
-	
-});
-
-$('#pdf').on('click',function(){
-	$("#formula").tableHTMLExport({
-		type:'pdf',
-		filename:'<?=$f_name?>.pdf',
-		orientation: 'p',
-		trimContent: true,
-    	quoteFields: true,
-		ignoreColumns: '.noexport',
-  		ignoreRows: '.noexport',
-		htmlContent: true,
-		maintitle: '<?=$f_name?>',
-		product: '<?php echo trim($product).' '.trim($ver);?>',
-	});
+<script>
+$('#btnGEN').click(function() {
+	$.ajax({ 
+		url: '/pages/views/formula/finishedProduct.php', 
+		type: 'POST',
+		data: {
+			fid: $("#formulaID").val(),
+			bottle_id: $("#bottle_id").val(),
+			carrier_id: $("#carrier_id").val(),
+			lid_id: $("#lid_id").val(),
+			concentration: $("#concentration").val(),
+			defCatClass: $("#defCatClass").val(),
+			supplier_id: $("#supplier_id").val(),
+			batch_id: $("#batch_id").val()
+		},
+		dataType: 'html',
+		success: function (data) {
+			$('#results').html(data);
+		}
+	  });
 });
 
-</script>
+</script>
\ No newline at end of file
diff --git a/pages/getFormMeta.php b/pages/getFormMeta.php
index 941d2ab7..98a10f8e 100755
--- a/pages/getFormMeta.php
+++ b/pages/getFormMeta.php
@@ -67,18 +67,18 @@
 
    <div class="form-row">
      <div class="form-group col">
-        <label class="control-label col-auto" for="formula_name">Formula Name:</label>
+        <label class="control-label col-auto" for="formula_name">Formula Name</label>
           <a href="#" data-name="name" class="name" id="formula_name" data-pk="<?php echo $info['id'];?>"><?php echo $info['name']?:'Unnamed';?></a>
       </div>
      <div class="form-group col">
-        <label class="control-label col-auto" for="product_name">Product Name:</label>
+        <label class="control-label col-auto" for="product_name">Product Name</label>
         <a href="#" data-name="product_name" class="product_name" id="product_name" data-pk="<?php echo $info['id'];?>"><?php echo $info['product_name'] ?: 'Not set';?></a>
      </div>
     </div>
 
     <div class="form-row">
      <div class="form-group col-md-6">
-        <label class="control-label col-auto" for="isProtected">Protected:</label>
+        <label class="control-label col-auto" for="isProtected">Protected</label>
         <input name="isProtected" type="checkbox" id="isProtected" value="1" <?php if($info['isProtected'] == '1'){; ?> checked="checked"  <?php } ?>/>
         <i class="fa-solid fa-circle-info" rel="tip" title="When enabled, formula is protected against deletion. By enabling this, a formula revision will be automatically created."></i>
      </div>
@@ -86,7 +86,7 @@
   
    <div class="form-row">
      <div class="form-group col-md-6">
-    	<label class="control-label col-auto" for="customer">Customer:</label>
+    	<label class="control-label col-auto" for="customer">Customer</label>
         <select name="customer" id="customer" class="form-control selectpicker" data-live-search="true">
       	  <option value="0">Internal use</option>
 		  <?php foreach ($customer as $c) {?>
@@ -95,7 +95,7 @@
     	</select>
     </div>
     <div class="form-group col-md-6">
-        <label class="control-label col-auto" for="defView">Default view:</label>
+        <label class="control-label col-auto" for="defView">Default view</label>
         <select name="defView" id="defView" class="form-control selectpicker" data-live-search="true">
           <option value="1" <?php if($info['defView']=="1") echo 'selected="selected"'; ?> >Ingredient Properties</option>
           <option value="2" <?php if($info['defView']=="2") echo 'selected="selected"'; ?> >Ingredient Notes</option>
@@ -105,7 +105,7 @@
   
    <div class="form-row">
      <div class="form-group col-md-6">
-        <label class="control-label col-auto" for="profile">Category:</label>
+        <label class="control-label col-auto" for="profile">Category</label>
         <select name="profile" id="profile" class="form-control selectpicker" data-live-search="true">
         <?php foreach ($fcat as $cat) { if($cat['type'] == 'profile'){?>        
             <option value="<?=$cat['cname'];?>" <?php echo ($info['profile']==$cat['cname'])?"selected=\"selected\"":""; ?>><?php echo $cat['name'];?></option>
@@ -114,7 +114,7 @@
     </div>  
   
     <div class="form-group col-md-6">
-    	<label class="control-label col-auto" for="tagsinput">Tags:</label>
+    	<label class="control-label col-auto" for="tagsinput">Tags</label>
         <input type="text" class="form-control control-label" id="tagsinput" data-role="tagsinput" />
     </div>
     
@@ -122,7 +122,7 @@
 
  <div class="form-row">
    <div class="form-group col-md-6">
-    <label class="control-label col-auto" for="catClass">Purpose:</label>
+    <label class="control-label col-auto" for="catClass">Purpose</label>
         <select name="catClass" id="catClass" class="form-control selectpicker" data-live-search="true">
             <option></option>
             <?php foreach ($cats as $IFRACategories) {?>
@@ -132,7 +132,7 @@
   </div>
    
   <div class="form-group col-md-6">
-    <label class="control-label col-auto" for="finalType">Final type:</label>
+    <label class="control-label col-auto" for="finalType">Final type</label>
         <select name="finalType" id="finalType" class="form-control selectpicker" data-live-search="true">  
             <option value="100">Concentrated (100%)</option>
             <?php foreach ($fTypes as $fType) {?>
@@ -144,7 +144,7 @@
 
  <div class="form-row">
    <div class="form-group col-md-6">
-    <label class="control-label col-auto" for="finalType">Status:</label>
+    <label class="control-label col-auto" for="finalType">Status</label>
         <select name="status" id="status" class="form-control selectpicker" data-live-search="true">  
             <option value="0" <?php if($info['status'] == "0"){ echo 'selected';}?>>Scheduled</option>
             <option value="1" <?php if($info['status'] == "1"){ echo 'selected';}?>>Under Developent</option>
@@ -156,7 +156,7 @@
     </div>
 
  <div class="form-group col-md-6">
-    <label class="control-label col-auto" for="gender">Gender:</label>
+    <label class="control-label col-auto" for="gender">Gender</label>
     <select name="gender" id="gender" class="form-control selectpicker" data-live-search="true">
     <?php foreach ($fcat as $cat) { if($cat['type'] == 'sex'){?>
         <option value="<?=$cat['cname'];?>" <?php echo ($info['sex']==$cat['cname'])?"selected=\"selected\"":""; ?>><?php echo $cat['name'];?></option>
@@ -167,7 +167,7 @@
  
  <div class="form-row">
     <div class="form-group col">
-        <label class="control-label col-auto" for="doc_file">Picture:</label>
+        <label class="control-label col-auto" for="doc_file">Picture</label>
         <input type="file" name="doc_file" id="doc_file" />
         <input type="submit" name="button" class="btn btn-primary mt-4" id="pic_upload" value="Upload">
         <div id="upload_resp"></div>
@@ -179,7 +179,7 @@
 <div class="col-sm-6">
      <div class="form-row">
         <div class="form-group col-auto">
-        <label class="control-label col-auto" for="notes">Notes:</label>
+        <label class="control-label col-auto" for="notes">Notes</label>
         <a href="#" data-name="notes" class="notes" data-type="textarea" id="notes" data-pk="<?php echo $info['id'];?>"><?php echo $info['notes']?: 'None';?></a>
         </div>
      </div>
@@ -189,7 +189,7 @@
  
 
 
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function(){
 
 	$('[rel=tip]').tooltip({placement: 'right'});
diff --git a/pages/lids.php b/pages/lids.php
index 74b75908..2f1aeefa 100644
--- a/pages/lids.php
+++ b/pages/lids.php
@@ -7,45 +7,41 @@
 	    $supplier[] = $suppliers;
 }
 ?>
-          <div>
-          <div class="card shadow mb-4">
-            <div class="card-header py-3">
-              <h2 class="m-0 font-weight-bold text-primary"><a href="#" id="mainTitle">Lids</a></h2>
-            </div>
-            <div class="card-body">
-             
-               <div class="text-right">
-                  <div class="btn-group">
-                     <button type="button" class="btn btn-primary dropdown-toggle mb-3" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
-                      <div class="dropdown-menu dropdown-menu-right">
-                      <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#addLid"><i class="fa-solid fa-plus mx-2"></i>Add new</a></li>
-                       <li><a class="dropdown-item" id="exportCSV" href="#"><i class="fa-solid fa-file-export mx-2"></i>Export to CSV</a></li>
-                       <li><a class="dropdown-item" id="exportJSON" href="/pages/export.php?format=json&kind=lids"><i class="fa-solid fa-file-export mx-2"></i>Export to JSON</a></li>
-                   </div>
-                 </div>        
-                 
-                <table class="table table-bordered" id="tdDataLids" width="100%" cellspacing="0">
-                  <thead>
-                    <tr>
-                      <th>Style</th>
-                      <th>Colour</th>
-                      <th>Price</th>
-                      <th>Supplier</th>
-                      <th>Pieces</th>
-                      <th></th>
-                    </tr>
-                  </thead>
-                </table>
-              </div>
-            </div>
-          </div>
+    <div class="card shadow mb-4">
+    	<div class="card-header py-3">
+            <h2 class="m-0 font-weight-bold text-primary"><a href="#" id="mainTitle">Lids</a></h2>
+        </div>
+        <div class="card-body">
+	        <div class="text-right">
+    	        <div class="btn-group">
+        	        <button type="button" class="btn btn-primary dropdown-toggle mb-3" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
+                    <div class="dropdown-menu dropdown-menu-right">
+                    <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#addLid"><i class="fa-solid fa-plus mx-2"></i>Add new</a></li>
+                    <li><a class="dropdown-item" id="exportCSV" href="#"><i class="fa-solid fa-file-export mx-2"></i>Export to CSV</a></li>
+                    <li><a class="dropdown-item" id="exportJSON" href="/pages/export.php?format=json&kind=lids"><i class="fa-solid fa-file-export mx-2"></i>Export to JSON</a></li>
+                </div>
+            </div>        
+        </div>   
+        <table class="table table-striped" id="tdDataLids" width="100%" cellspacing="0">
+          <thead>
+            <tr>
+              <th>Style</th>
+              <th>Colour</th>
+              <th>Price</th>
+              <th>Supplier</th>
+              <th>Pieces</th>
+              <th></th>
+            </tr>
+          </thead>
+        </table>
         </div>
+       </div>
       </div>
     </div>
     
 <!-- ADD LID MODAL-->
 <div class="modal fade" id="addLid" data-bs-backdrop="static" tabindex="-1" aria-labelledby="addLidLabel" aria-hidden="true">
-  <div class="modal-dialog modal-dialog-centered" role="document">
+  <div class="modal-dialog modal-lg" role="document">
     <div class="modal-content">
       <div class="modal-header">
         <h5 class="modal-title" id="addLidLabel">Add Lid</h5>
@@ -126,75 +122,74 @@
   	});
 	
 	var tdDataLids = $('#tdDataLids').DataTable( {
-	columnDefs: [
-		{ className: 'pv_vertical_middle text-center', targets: '_all' },
-		{ orderable: false, targets: [5] },
-	],
-	dom: 'lrftip',
-	buttons: [{
-				extend: 'csvHtml5',
-				title: "Lid Inventory",
-				exportOptions: {
-     				columns: [0, 1, 2, 3, 4]
-  				},
-			  }],
-	processing: true,
-	serverSide: true,
-	searching: true,
-	mark: true,
-	language: {
-		loadingRecords: '&nbsp;',
-		processing: 'Please Wait...',
-		zeroRecords: 'Nothing found',
-		search: 'Quick Search:',
-		searchPlaceholder: 'Name..',
+		columnDefs: [
+			{ className: 'pv_vertical_middle text-center', targets: '_all' },
+			{ orderable: false, targets: [5] },
+		],
+		dom: 'lrftip',
+		buttons: [{
+					extend: 'csvHtml5',
+					title: "Lid Inventory",
+					exportOptions: {
+						columns: [0, 1, 2, 3, 4]
+					},
+		}],
+		processing: true,
+		serverSide: true,
+		searching: true,
+		mark: true,
+		language: {
+			loadingRecords: '&nbsp;',
+			processing: 'Please Wait...',
+			zeroRecords: 'Nothing found',
+			search: 'Quick Search:',
+			searchPlaceholder: 'Name..',
 		},
-	ajax: {	
-		url: '/core/list_lid_data.php',
-		type: 'POST',
-		dataType: 'json',
-				data: function(d) {
-				if (d.order.length>0){
-					d.order_by = d.columns[d.order[0].column].data
-					d.order_as = d.order[0].dir
-				}
-			},
+		ajax: {	
+			url: '/core/list_lid_data.php',
+			type: 'POST',
+			dataType: 'json',
+					data: function(d) {
+					if (d.order.length>0){
+						d.order_by = d.columns[d.order[0].column].data
+						d.order_as = d.order[0].dir
+					}
+				},
 		},
-	   columns: [
-            { data : 'style', title: 'Style', render: style },
+		columns: [
+			{ data : 'style', title: 'Style', render: style },
 			{ data : 'colour', title: 'Colour' },
 			{ data : 'price', title: 'Price (<?php echo $settings['currency'];?>)' },
 			{ data : 'supplier', title: 'Supplier' },
 			{ data : 'pieces', title: 'Pieces in stock' },
-			{ data : null, title: '', render: actions },
-
-			],
-	order: [[ 0, 'asc' ]],
-	lengthMenu: [[20, 50, 100, 200, 400], [20, 50, 100, 200, 400]],
-	pageLength: 20,
-	displayLength: 20,
-	stateSave: true,
-	stateDuration: -1,
-	stateLoadCallback: function (settings, callback) {
-       	$.ajax( {
-           	url: '/core/update_user_settings.php?set=listLids&action=load',
-           	dataType: 'json',
-           	success: function (json) {
-               	callback( json );
-           	}
-       	});
-    },
-    stateSaveCallback: function (settings, data) {
-	   $.ajax({
-		 url: "/core/update_user_settings.php?set=listLids&action=save",
-		 data: data,
-		 dataType: "json",
-		 type: "POST"
-	  });
-	},
-	drawCallback: function( settings ) {
-		extrasShow();
-    },
+			{ data : null, title: '', render: actions }
+		],
+		order: [[ 0, 'asc' ]],
+		lengthMenu: [[20, 50, 100, 200, 400], [20, 50, 100, 200, 400]],
+		pageLength: 20,
+		displayLength: 20,
+		stateSave: true,
+		stateDuration: -1,
+		stateLoadCallback: function (settings, callback) {
+			$.ajax( {
+				url: '/core/update_user_settings.php?set=listLids&action=load',
+				dataType: 'json',
+				success: function (json) {
+					callback( json );
+				}
+			});
+		},
+		stateSaveCallback: function (settings, data) {
+		   $.ajax({
+			   url: "/core/update_user_settings.php?set=listLids&action=save",
+				data: data,
+				dataType: "json",
+				type: "POST"
+			});
+		},
+		drawCallback: function( settings ) {
+			extrasShow();
+		},
 
 	});
 	
@@ -219,15 +214,15 @@
 	function format ( d ) {
 		details = '<img src="'+d.photo+'" class="img_ifra"/>';
 		return details;
-	}
+	};
 	
 	function style(data, type, row){
 		return '<i class="pv_point_gen pv_gen_li" id="lid_name">'+row.style+'</i>';
-	}
+	};
 	
 	function actions(data, type, row){	
 			data = '<div class="dropdown">' +
-			'<button type="button" class="btn btn-primary btn-floating dropdown-toggle hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+			'<button type="button" class="btn btn-floating hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
 				'<ul class="dropdown-menu dropdown-menu-right">';
 			data += '<li><a href="#" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#editLid" rel="tip" title="Edit '+ row.style +'" data-id='+ row.id +' data-name="'+ row.style +'"><i class="fas fa-edit mx-2"></i>Edit</a></li>';
 			data += '<li><a href="'+ row.supplier_link +'" target="_blank" class="dropdown-item" rel="tip" title="Open '+ row.style +' page"><i class="fas fa-shopping-cart mx-2"></i>Go to supplier</a></li>';
@@ -235,11 +230,11 @@ function actions(data, type, row){
 			data += '<li><a class="dropdown-item" href="#" id="ldlDel" style="color: #c9302c;" rel="tip" title="Delete '+ row.name +'" data-id='+ row.id +' data-name="'+ row.style +'"><i class="fas fa-trash mx-2"></i>Delete</a></li>';
 			data += '</ul></div>';
 		return data;
-	}
+	};
 	
 	function reload_data() {
 		$('#tdDataLids').DataTable().ajax.reload(null, true);
-	}
+	};
 	
 	$('#tdDataLids').on('click', '[id*=ldlDel]', function () {
 		var ldl = {};
diff --git a/pages/listFormulas.php b/pages/listFormulas.php
index a8e12c0f..ad7887f3 100644
--- a/pages/listFormulas.php
+++ b/pages/listFormulas.php
@@ -77,7 +77,7 @@
 </ul>
 <div class="tab-content table-responsive">
     <div class="tab-pane" id="tab-all">
-        <table id="all-table" class="table table-striped table-bordered" width="100%" cellspacing="0">
+        <table id="all-table" class="table table-striped" width="100%" cellspacing="0">
             <thead>
                 <tr>
                     <th>Formula Name</th>
@@ -96,7 +96,7 @@
     </div>
     <?php foreach ($fcat as $cat) {?>
     <div class="tab-pane" id="tab-<?=$cat['cname']?>">
-        <table id="<?=$cat['cname']?>-table" class="table table-striped table-bordered" width="100%" cellspacing="0">
+        <table id="<?=$cat['cname']?>-table" class="table table-striped" width="100%" cellspacing="0">
             <thead>
                 <tr>
                     <th>Formula Name</th>
@@ -118,572 +118,575 @@
 </div>
 
 <?php } ?>
-<script type="text/javascript" language="javascript" >
+<script>
+$(document).ready(function() {
+
 	$('#mainTitle').click(function() {
-	 	reload_formulas_data();
-  	});
-$('.selectpicker').selectpicker('refresh');
-function extrasShow() {
-	$('[rel=tip]').tooltip({
-		"html": true,
-		"delay": {"show": 100, "hide": 0},
+		reload_formulas_data();
 	});
-};
-
-$(".tabs").click(function() {
-     var src = $(this).data("source");
-     var tableId = $(this).data("table");
-     initTable(tableId, src);
-});
-
-function initTable(tableId, src) {
-    var table = $("#" + tableId).DataTable({
-	   ajax: {
-		   url: src,
-		   type: 'POST',
-		   dataType: 'json',
-		   data: function(d) {
-			   if (d.order.length>0){
-					d.order_by = d.columns[d.order[0].column].data
-					d.order_as = d.order[0].dir
-				}
-			},
-		},
-		columns: [
-		   { data : 'name', title: 'Formula Name', render: fName },
-		   { data : 'product_name', title: 'Product Name', render: pName},
-		   { data : 'status', title: 'Status', render: fStatus},
-		   { data : 'ingredients', title: 'Ingredients'},
-		   { data : 'revision', title: 'Revision'},
-		   { data : 'isMade', title: 'Made', render: fMade},
-		   { data : 'rating', title: 'Rating', render: rating},
-		   { data : 'created', title: 'Created', render: fDate},
-		   { data : 'updated', title: 'Updated', render: fDate},
-		   { data : null, title: '', render: fActions},				   
-		],
-		processing: true,
-		serverSide: true,
-		searching: true,
-		responsive: true,
-		language: {
-			loadingRecords: '&nbsp;',
-			processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw"></i>',
-			emptyTable: '<div class="row g-3"><div class="alert alert-info alert-dismissible"><i class="fa-solid fa-circle-info mx-2"></i><strong>No formulas yet, click <a href="#" data-bs-toggle="modal" data-bs-target="#add_formula">here</a> to add or use the <a href="/?do=marketplace">Marketplace</a> to import a demo one</strong></div></div>',
-			searchPlaceholder: 'Formula name, or product name...',
-			search: "Search for formula:"
-		},
-	    order: [0,'asc'],
-	    columnDefs: [
-			{ orderable: false, targets: [2, 3, 9] },
-			{ className: 'text-center', targets: '_all' },
-			{ responsivePriority: 1, targets: 0 }
-		],
-	    destroy: true,
-        bFilter: true,
-        paging:  true,
-		info:   true,
-		lengthMenu: [[20, 40, 60, 100], [20, 40, 60, 100]],
-		pageLength: 20,
-		displayLength: 20,
-		drawCallback: function( settings ) {
-			extrasShow();
-     	},
-		createdRow: function(row, data, dataIndex){
-            initRating(row);
-        },
-		stateSave: true,
-		stateDuration: -1,
-		stateLoadCallback: function (settings, callback) {
-        	$.ajax( {
-            	url: "/core/update_user_settings.php?set=listFormulas&action=load&tableId=" + tableId,
-            	dataType: "json",
-            	success: function (json) {
-                	callback( json );
-            	}
-        	});
-    	},
-    	stateSaveCallback: function (settings, data) {
-		   $.ajax({
-			 url: "/core/update_user_settings.php?set=listFormulas&action=save&tableId=" + tableId,
-			 data: data,
-			 dataType: "json",
-			 type: "POST"
-		  });
-		},
+	$('.selectpicker').selectpicker('refresh');
+	function extrasShow() {
+		$('[rel=tip]').tooltip({
+			"html": true,
+			"delay": {"show": 100, "hide": 0},
+		});
+	};
+	
+	$(".tabs").click(function() {
+		 var src = $(this).data("source");
+		 var tableId = $(this).data("table");
+		 initTable(tableId, src);
 	});
-}
-
-initTable("all-table", "/core/list_formula_data.php");
-
-$("#listFormulas").tabs();
-
-function rating(data, type, row, meta){
-  	data = '<span class="rating" data-id='+row.id+' data-score="'+row.rating+'"></span>';
-	return data;
-}
-
-function fName(data, type, row, meta){
-	if(type === 'display'){
-		if(row.isProtected == 1){
-			var pad = 'class="fas fa-lock" rel="tip" title="Formula is protected"';
-		}else{
-			var pad = 'class="fas fa-unlock"  rel="tip" title="Formula is not protected"';
-		}
-		data = '<div '+ pad +'></div><a href="/?do=Formula&id=' + row.id + '" target="_blank"> ' + data + '</a>';
-	}
-  return data;
-}
-
-
-function pName(data, type, row, meta){
-	data = '<i class="pv_point_gen_color" data-bs-toggle="modal" data-bs-target="#getFormMeta" data-id="' + row.id + '" data-formula="'+row.name+'">'+row.product_name+'</i>';
 	
-  return data;
-}
-
-function fMade(data, type, row, meta){
-	if(type === 'display'){
-		if(row.isMade == 1){
-			var data = '<i class="fas fa-check-circle alert-success" rel="tip" title="Formula last made on ' + row.madeOn + '"></i>';
-		}else{
-			var data = '<i class="fas fa-hourglass-start" rel="tip" title="Formula is not made yet"></i>';
-		}
+	function initTable(tableId, src) {
+		var table = $("#" + tableId).DataTable({
+		   ajax: {
+			   url: src,
+			   type: 'POST',
+			   dataType: 'json',
+			   data: function(d) {
+				   if (d.order.length>0){
+						d.order_by = d.columns[d.order[0].column].data
+						d.order_as = d.order[0].dir
+					}
+				},
+			},
+			columns: [
+			   { data : 'name', title: 'Formula Name', render: fName },
+			   { data : 'product_name', title: 'Product Name', render: pName},
+			   { data : 'status', title: 'Status', render: fStatus},
+			   { data : 'ingredients', title: 'Ingredients'},
+			   { data : 'revision', title: 'Revision'},
+			   { data : 'isMade', title: 'Made', render: fMade},
+			   { data : 'rating', title: 'Rating', render: rating},
+			   { data : 'created', title: 'Created', render: fDate},
+			   { data : 'updated', title: 'Updated', render: fDate},
+			   { data : null, title: '', render: fActions},				   
+			],
+			processing: true,
+			serverSide: true,
+			searching: true,
+			responsive: true,
+			language: {
+				loadingRecords: '&nbsp;',
+				processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw"></i>',
+				emptyTable: '<div class="row g-3"><div class="alert alert-info alert-dismissible"><i class="fa-solid fa-circle-info mx-2"></i><strong>No formulas yet, click <a href="#" data-bs-toggle="modal" data-bs-target="#add_formula">here</a> to add or use the <a href="/?do=marketplace">Marketplace</a> to import a demo one</strong></div></div>',
+				searchPlaceholder: 'Formula name, or product name...',
+				search: "Search"
+			},
+			order: [0,'asc'],
+			columnDefs: [
+				{ orderable: false, targets: [2, 3, 9] },
+				{ className: 'text-center', targets: '_all' },
+				{ responsivePriority: 1, targets: 0 }
+			],
+			destroy: true,
+			bFilter: true,
+			paging:  true,
+			info:   true,
+			lengthMenu: [[20, 40, 60, 100], [20, 40, 60, 100]],
+			pageLength: 20,
+			displayLength: 20,
+			drawCallback: function( settings ) {
+				extrasShow();
+			},
+			createdRow: function(row, data, dataIndex){
+				initRating(row);
+			},
+			stateSave: true,
+			stateDuration: -1,
+			stateLoadCallback: function (settings, callback) {
+				$.ajax( {
+					url: "/core/update_user_settings.php?set=listFormulas&action=load&tableId=" + tableId,
+					dataType: "json",
+					success: function (json) {
+						callback( json );
+					}
+				});
+			},
+			stateSaveCallback: function (settings, data) {
+			   $.ajax({
+				 url: "/core/update_user_settings.php?set=listFormulas&action=save&tableId=" + tableId,
+				 data: data,
+				 dataType: "json",
+				 type: "POST"
+			  });
+			},
+		});
 	}
-  return data;
-}
-
-function fStatus(data, type, row, meta){
-	if(row.status == 0){
-		var data = '<span class="pv-label badge badge-secondary">Scheduled</span>';
+	
+	initTable("all-table", "/core/list_formula_data.php");
+	
+	$("#listFormulas").tabs();
+	
+	function rating(data, type, row, meta){
+		data = '<span class="rating" data-id='+row.id+' data-score="'+row.rating+'"></span>';
+		return data;
 	}
-	if(row.status == 1){
-		var data = '<span class="pv-label badge badge-primary">Under Development</span>';
+	
+	function fName(data, type, row, meta){
+		if(type === 'display'){
+			if(row.isProtected == 1){
+				var pad = 'class="fas fa-lock" rel="tip" title="Formula is protected"';
+			}else{
+				var pad = 'class="fas fa-unlock"  rel="tip" title="Formula is not protected"';
+			}
+			data = '<div '+ pad +'></div><a href="/?do=Formula&id=' + row.id + '" target="_blank"> ' + data + '</a>';
+		}
+	  return data;
 	}
-	if(row.status == 2){
-		var data = '<span class="pv-label badge badge-info">Under Evaluation</span>';
+	
+	
+	function pName(data, type, row, meta){
+		data = '<i class="pv_point_gen_color" data-bs-toggle="modal" data-bs-target="#getFormMeta" data-id="' + row.id + '" data-formula="'+row.name+'">'+row.product_name+'</i>';
+		
+	  return data;
 	}
-	if(row.status == 3){
-		var data = '<span class="pv-label badge badge-success">In Production</span>';
+	
+	function fMade(data, type, row, meta){
+		if(type === 'display'){
+			if(row.isMade == 1){
+				var data = '<i class="fas fa-check-circle text-success-emphasis" rel="tip" title="Formula last made on ' + row.madeOn + '"></i>';
+			}else{
+				var data = '<i class="fas fa-hourglass-start" rel="tip" title="Formula is not made yet"></i>';
+			}
+		}
+	  return data;
 	}
-	if(row.status == 4){
-		var data = '<span class="pv-label badge badge-warning">To be reformulated</span>';
+	
+	function fStatus(data, type, row, meta){
+		if(row.status == 0){
+			var data = '<span class="pv-label badge badge-secondary">Scheduled</span>';
+		}
+		if(row.status == 1){
+			var data = '<span class="pv-label badge badge-primary">Under Development</span>';
+		}
+		if(row.status == 2){
+			var data = '<span class="pv-label badge badge-info">Under Evaluation</span>';
+		}
+		if(row.status == 3){
+			var data = '<span class="pv-label badge badge-success">In Production</span>';
+		}
+		if(row.status == 4){
+			var data = '<span class="pv-label badge badge-warning">To be reformulated</span>';
+		}
+		if(row.status == 5){
+			var data = '<span class="pv-label badge badge-danger">Failure</span>';
+		}
+		
+		return data;
 	}
-	if(row.status == 5){
-		var data = '<span class="pv-label badge badge-danger">Failure</span>';
+	
+	function fDate(data, type, row, meta){
+	  if(type === 'display'){
+		if(data == '0000-00-00 00:00:00'){
+		  data = '-';
+		}else{
+			let dateTimeParts= data.split(/[- :]/); 
+			dateTimeParts[1]--; 
+			const dateObject = new Date(...dateTimeParts); 
+			data = dateObject.toLocaleDateString() + " " + dateObject.toLocaleTimeString();
+		}
+	  }
+	  return data;
 	}
 	
-	return data;
-}
-
-function fDate(data, type, row, meta){
-  if(type === 'display'){
-    if(data == '0000-00-00 00:00:00'){
-      data = '-';
-    }else{
-	    let dateTimeParts= data.split(/[- :]/); 
-		dateTimeParts[1]--; 
-		const dateObject = new Date(...dateTimeParts); 
-        data = dateObject.toLocaleDateString() + " " + dateObject.toLocaleTimeString();
-    }
-  }
-  return data;
-}
-
-function fActions(data, type, row, meta){
-		data = '<div class="dropdown">' +
-        '<button type="button" class="btn btn-primary btn-floating dropdown-toggle hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
-            '<ul class="dropdown-menu dropdown-menu-right">';
+	function fActions(data, type, row, meta){
+			data = '<div class="dropdown">' +
+			'<button type="button" class="btn btn-floating hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+				'<ul class="dropdown-menu dropdown-menu-right">';
+				
+			data += '<li><a class="pv_point_gen dropdown-item" data-bs-toggle="modal" data-bs-target="#getFormMeta" data-formula="'+row.name+'" data-id="' + row.id + '"><i class="fas fa-cogs mx-2"></i>Settings</a></li>';
+	
+			data += '<li><a class="dropdown-item" href="/pages/operations.php?action=exportFormulas&fid=' + row.fid + '" rel="tip" title="Export '+ row.name +' as JSON" ><i class="fas fa-download mx-2"></i>Export as JSON</a></li>';
 			
-		data += '<li><i class="pv_point_gen link-dark dropdown-item" data-bs-toggle="modal" data-bs-target="#getFormMeta" data-formula="'+row.name+'" data-id="' + row.id + '"><i class="fas fa-cogs mx-2"></i>Settings</i></li>';
-
-		data += '<li><a class="dropdown-item" href="/pages/operations.php?action=exportFormulas&fid=' + row.fid + '" rel="tip" title="Export '+ row.name +' as JSON" ><i class="fas fa-download mx-2"></i>Export as JSON</a></li>';
+			data += '<li><a class="dropdown-item" href="#" id="addTODO" rel="tip" title="Schedule '+ row.name +' to make" data-id='+ row.fid +' data-name="'+ row.name +'"><i class="fas fa-tasks mx-2"></i>Schedule to make</a></li>';
+			
+			data += '<li><a class="dropdown-item" href="#" id="cloneMe" rel="tip" title="Duplicate '+ row.name +'" data-id='+ row.fid +' data-name="'+ row.name +'"><i class="fas fa-copy mx-2"></i>Duplicate formula</a></li>';
+			
+			data += '<li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#genQRC" data-id="'+ row.fid +'" data-formula="'+ row.name +'"><i class="fa-solid fa-qrcode mx-2"></i>Generate QR Code</a></li>';
+	
+	
+			data += '<div class="dropdown-divider"></div>';
+			data += '<li><a class="dropdown-item link-danger" href="#" id="deleteMe" rel="tip" title="Delete '+ row.name +'" data-id="'+ row.fid +'" data-name="'+ row.name +'"><i class="fas fa-trash mx-2"></i>Permanently delete formula</a></li>';
+			data += '</ul></div>';
 		
-		data += '<li><a class="dropdown-item" href="#" id="addTODO" rel="tip" title="Schedule '+ row.name +' to make" data-id='+ row.fid +' data-name="'+ row.name +'"><i class="fas fa-tasks mx-2"></i>Schedule to make</a></li>';
+		return data;
+	}
+	
+	//Generate a QR
+	$("#genQRC").on("show.bs.modal", function(e) {
+		const id = e.relatedTarget.dataset.id;
+		const formula = e.relatedTarget.dataset.formula;
+	
+	  $.get("/pages/views/generic/qrcode.php?type=formula&id=" + id)
+		.then(data => {
+		  $("#genQRLabel", this).html(formula);
+		  $(".modal-body", this).html(data);
+		 // $("#msg_settings_info", this).html('');
+		});
+	
+	});
+	
+	//Duplicate
+	$('table.table').on('click', '[id*=cloneMe]', function () {
+		var formula = {};
+		formula.ID = $(this).attr('data-id');
+		formula.Name = $(this).attr('data-name');
 		
-		data += '<li><a class="dropdown-item" href="#" id="cloneMe" rel="tip" title="Clone '+ row.name +'" data-id='+ row.fid +' data-name="'+ row.name +'"><i class="fas fa-copy mx-2"></i>Clone formula</a></li>';
+		$.ajax({ 
+			url: '/pages/manageFormula.php', 
+			type: 'POST',
+			data: {
+				action: "clone",
+				fid: formula.ID,
+				fname: formula.Name,
+				},
+			dataType: 'json',
+			success: function (data) {
+				if ( data.success ) {
+					$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+					$('.toast-header').removeClass().addClass('toast-header alert-success');
+					reload_formulas_data();
+				} else {
+					$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
+					$('.toast-header').removeClass().addClass('toast-header alert-danger');
+				}
+				$('.toast').toast('show');
+			}
+		  });
+	});
+	
+	$('table.table').on('click', '[id*=deleteMe]', function () {
+		var formula = {};
+		formula.ID = $(this).attr('data-id');
+		formula.Name = $(this).attr('data-name');
 		
-		data += '<li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#genQRC" data-id="'+ row.fid +'" data-formula="'+ row.name +'"><i class="fa-solid fa-qrcode mx-2"></i>Generate QR Code</a></li>';
-
-
-		data += '<div class="dropdown-divider"></div>';
-		data += '<li><a class="dropdown-item link-danger" href="#" id="deleteMe" rel="tip" title="Delete '+ row.name +'" data-id="'+ row.fid +'" data-name="'+ row.name +'"><i class="fas fa-trash mx-2"></i>Permanently delete formula</a></li>';
-		data += '</ul></div>';
+		bootbox.dialog({
+		   title: "Confirm formula deletion",
+		   message : '<div class="alert alert-warning">WARNING, this action cannot be reverted unless you have a backup.</div><p>Permantly delete <strong>'+ $(this).attr('data-name') +'</strong> formula?</p>' +
+		   '<div class="form-group col-sm">' + 
+			'<input name="archiveFormula" id="archiveFormula" type="checkbox" value="1">'+
+			'<label class="form-check-label mx-2" for="archiveFormula">Archive formula</label>'+
+		   '</div>',
+		   buttons :{
+			   main: {
+				   label : "DELETE",
+				   className : "btn-danger",
+				   callback: function (){
+						
+					$.ajax({ 
+						url: '/pages/manageFormula.php', 
+						type: 'POST',
+						data: {
+							action: "deleteFormula",
+							fid: formula.ID,
+							fname: formula.Name,
+							archiveFormula: $("#archiveFormula").is(':checked'),
+						},
+						dataType: 'json',
+						success: function (data) {
+							if ( data.success ) {
+								$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+								$('.toast-header').removeClass().addClass('toast-header alert-success');
+								reload_formulas_data();
+							} else {
+								$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
+								$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							}
+							$('.toast').toast('show');
+						}
+					  });
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
 	
-    return data;
-}
-
-//Generate a QR
-$("#genQRC").on("show.bs.modal", function(e) {
-	const id = e.relatedTarget.dataset.id;
-  	const formula = e.relatedTarget.dataset.formula;
-
-  $.get("/pages/views/generic/qrcode.php?type=formula&id=" + id)
-    .then(data => {
-      $("#genQRLabel", this).html(formula);
-      $(".modal-body", this).html(data);
-	 // $("#msg_settings_info", this).html('');
-    });
-
-});
-
-//Clone
-$('table.table').on('click', '[id*=cloneMe]', function () {
-	var formula = {};
-	formula.ID = $(this).attr('data-id');
-	formula.Name = $(this).attr('data-name');
+	$('#wipe_all_formulas').click(function() {
+		
+		bootbox.dialog({
+		   title: "Confirm formulas wipe",
+		   message : 'This will remove ALL of your fromulas from the database.\nThis cannot be reverted so please make sure you have taken a backup first.',
+		   buttons :{
+			   main: {
+				   label : "DELETE ALL",
+				   className : "btn-danger",
+				   callback: function (){
+						
+					$.ajax({
+						url: '/pages/update_data.php', 
+						type: 'POST',
+						data: {
+							formulas_wipe: "true",
+							},
+						dataType: 'json',
+						success: function (data) {
+							if ( data.success ) {
+								$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+								$('.toast-header').removeClass().addClass('toast-header alert-success');
+								reload_formulas_data();
+							} else {
+								$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
+								$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							}
+							$('.toast').toast('show');
+						}
+					});
+					
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
 	
-	$.ajax({ 
+	$('table.table').on('click', '[id*=addTODO]', function () {
+		var formula = {};
+		formula.ID = $(this).attr('data-id');
+		formula.Name = $(this).attr('data-name');
+		$.ajax({ 
 		url: '/pages/manageFormula.php', 
 		type: 'POST',
 		data: {
-			action: "clone",
+			action: 'todo',
 			fid: formula.ID,
 			fname: formula.Name,
+			add: true,
 			},
 		dataType: 'json',
 		success: function (data) {
 			if ( data.success ) {
-            	$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+				$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
 				$('.toast-header').removeClass().addClass('toast-header alert-success');
-				reload_formulas_data();
 			} else {
-            	$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
+				$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
 				$('.toast-header').removeClass().addClass('toast-header alert-danger');
 			}
 			$('.toast').toast('show');
 		}
 	  });
-});
-
-$('table.table').on('click', '[id*=deleteMe]', function () {
-	var formula = {};
-	formula.ID = $(this).attr('data-id');
-	formula.Name = $(this).attr('data-name');
-    
-	bootbox.dialog({
-       title: "Confirm formula deletion",
-       message : '<div class="alert alert-warning">WARNING, this action cannot be reverted unless you have a backup.</div><p>Permantly delete <strong>'+ $(this).attr('data-name') +'</strong> formula?</p>' +
-	   '<div class="form-group col-sm">' + 
-       	'<input name="archiveFormula" id="archiveFormula" type="checkbox" value="1">'+
-       	'<label class="form-check-label mx-2" for="archiveFormula">Archive formula</label>'+
-       '</div>',
-       buttons :{
-           main: {
-               label : "DELETE",
-               className : "btn-danger",
-               callback: function (){
-	    			
-				$.ajax({ 
-					url: '/pages/manageFormula.php', 
-					type: 'POST',
-					data: {
-						action: "deleteFormula",
-						fid: formula.ID,
-						fname: formula.Name,
-						archiveFormula: $("#archiveFormula").is(':checked'),
-					},
-					dataType: 'json',
-					success: function (data) {
-						if ( data.success ) {
-							$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-							$('.toast-header').removeClass().addClass('toast-header alert-success');
-							reload_formulas_data();
-						} else {
-							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
-							$('.toast-header').removeClass().addClass('toast-header alert-danger');
-						}
-						$('.toast').toast('show');
-					}
-				  });
-                 return true;
-               }
-           },
-           cancel: {
-               label : "Cancel",
-               className : "btn-secondary",
-               callback : function() {
-                   return true;
-               }
-           }   
-       },onEscape: function () {return true;}
-   });
-});
-
-$('#wipe_all_formulas').click(function() {
-    
-	bootbox.dialog({
-       title: "Confirm formulas wipe",
-       message : 'This will remove ALL of your fromulas from the database.\nThis cannot be reverted so please make sure you have taken a backup first.',
-       buttons :{
-           main: {
-               label : "DELETE ALL",
-               className : "btn-danger",
-               callback: function (){
-	    			
-				$.ajax({
-					url: '/pages/update_data.php', 
-					type: 'POST',
-					data: {
-						formulas_wipe: "true",
-						},
-					dataType: 'json',
-					success: function (data) {
-						if ( data.success ) {
-							$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-							$('.toast-header').removeClass().addClass('toast-header alert-success');
-							reload_formulas_data();
-						} else {
-							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
-							$('.toast-header').removeClass().addClass('toast-header alert-danger');
-						}
-						$('.toast').toast('show');
-					}
-				});
-				
-                 return true;
-               }
-           },
-           cancel: {
-               label : "Cancel",
-               className : "btn-secondary",
-               callback : function() {
-                   return true;
-               }
-           }   
-       },onEscape: function () {return true;}
-   });
-});
-
-$('table.table').on('click', '[id*=addTODO]', function () {
-	var formula = {};
-	formula.ID = $(this).attr('data-id');
-	formula.Name = $(this).attr('data-name');
-	$.ajax({ 
-    url: '/pages/manageFormula.php', 
-	type: 'POST',
-    data: {
-		action: 'todo',
-		fid: formula.ID,
-		fname: formula.Name,
-		add: true,
-		},
-	dataType: 'json',
-    success: function (data) {
-		if ( data.success ) {
-			$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-			$('.toast-header').removeClass().addClass('toast-header alert-success');
-		} else {
-			$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
-			$('.toast-header').removeClass().addClass('toast-header alert-danger');
-		}
-		$('.toast').toast('show');
-    }
-  });
-});
-
-$('#add_formula').on('click', '[id*=btnAdd]', function () {
-	$.ajax({ 
-    url: '/pages/manageFormula.php', 
-	type: 'POST',
-    data: {
-		action: 'addFormula',
-		name: $("#formula-name").val(),
-		profile: $("#profile").val(),
-		catClass: $("#catClass").val(),
-		finalType: $("#finalType").val(),
-		notes: $("#notes").val(),
-		customer: $("#customer").val(),
-		},
-	dataType: 'json',
-    success: function (data) {
-		if(data.error){
-			var rmsg = '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+data.error+'</div>';
-		}else if(data.success){
-			var rmsg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><a href="?do=Formula&id='+data.success.id+'">'+data.success.msg+'</a></div>';
-			reload_formulas_data();
-			if($("#go_to_formula").prop("checked")){
-				window.location = "/?do=Formula&id=" + data.success.id
+	});
+	
+	$('#add_formula').on('click', '[id*=btnAdd]', function () {
+		$.ajax({ 
+		url: '/pages/manageFormula.php', 
+		type: 'POST',
+		data: {
+			action: 'addFormula',
+			name: $("#formula-name").val(),
+			profile: $("#profile").val(),
+			catClass: $("#catClass").val(),
+			finalType: $("#finalType").val(),
+			notes: $("#notes").val(),
+			customer: $("#customer").val(),
+			},
+		dataType: 'json',
+		success: function (data) {
+			if(data.error){
+				var rmsg = '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+data.error+'</div>';
+			}else if(data.success){
+				var rmsg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><a href="?do=Formula&id='+data.success.id+'">'+data.success.msg+'</a></div>';
+				reload_formulas_data();
+				if($("#go_to_formula").prop("checked")){
+					window.location = "/?do=Formula&id=" + data.success.id
+				}
 			}
+			$('#addFormulaMsg').html(rmsg);
+			
 		}
-	  	$('#addFormulaMsg').html(rmsg);
+	  });
+	});
+	
+	$("#btnImport").prop("disabled", true);
+	$("#btnImport").hide();
 		
-    }
-  });
-});
-
-$("#btnImport").prop("disabled", true);
-$("#btnImport").hide();
+	$("input[type=file]").on('change',function(){	
+		var fd = new FormData();
+		var files = $('#CSVFile')[0].files;
+		var formula_name = $('#CSVname').val();
+		
+		if ( formula_name == '') {
+			var filename = $('input[type=file]').val().replace(/C:\\fakepath\\/i, '').replace(/.csv/i, '');
+			$('#CSVname').val(filename);
+		}
+		
+		if(files.length > 0 ){
+			fd.append('CSVFile',files[0]);
+			$.ajax({
+			   url: '/pages/upload.php?type=frmCSVImport&step=upload',
+			   type: 'POST',
+			   data: fd,
+			   contentType: false,
+			   processData: false,
+					 cache: false,
+			   success: function(response){
+				 if(response != 0){
+					$("#CSVImportMsg").html('');
+					$("#step_upload").html(response);
+					$("#btnImport").show();
+				  }else{
+					$("#CSVImportMsg").html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><strong>Error:</strong> File upload failed!</div>');
+				  }
+			},
+		 });
+		}else{
+			$("#CSVImportMsg").html('<div class="alert alert-danger">Please select a file to upload!</div>');
+		}
+	});
 	
-$("input[type=file]").on('change',function(){	
-	var fd = new FormData();
-    var files = $('#CSVFile')[0].files;
-	var formula_name = $('#CSVname').val();
 	
-	if ( formula_name == '') {
-		var filename = $('input[type=file]').val().replace(/C:\\fakepath\\/i, '').replace(/.csv/i, '');
-		$('#CSVname').val(filename);
-	}
+	var total_selection = 0;
+	var ingredient = 0;
+	var concentration = 0;
+	var dilutant = 0;
+	var quantity = 0;
+	
+	var column_data = [];
+	
+	$(document).on('change', '.set_column_data', function(){
+		var column_name = $(this).val();
+		var column_number = $(this).data('column_number');
+		if(column_name in column_data) {
+		  $('#CSVImportMsg').html('<div class="alert alert-danger"><strong>'+column_name+'</strong> is already assigned.</div>');
+		  $(this).val('');
+		  return false;
+		}else{
+			$('#CSVImportMsg').html('');
+		}
+	
+		if(column_name != '') {
+		  column_data[column_name] = column_number;
+		} else {
+		  const entries = Object.entries(column_data);
+	
+		  for(const [key, value] of entries) {
+			if(value == column_number) {
+			  delete column_data[key];
+			}
+		  }
+		}
+	
+		total_selection = Object.keys(column_data).length;
+	
+		if(total_selection == 4) {
+			$('#btnImport').prop("disabled", false);
+			ingredient = column_data.ingredient;
+			concentration = column_data.concentration;
+			dilutant = column_data.dilutant;
+			quantity = column_data.quantity;
+		} else {
+			$('#btnImport').prop("disabled", true);
+		}
+	
+	  });
+	
+	$(document).on('click', '#btnImport', function(event){
 	
-	if(files.length > 0 ){
-		fd.append('CSVFile',files[0]);
+		event.preventDefault();
+		var formula_name = $('#CSVname').val();
+		var formula_profile = $('#CSVProfile').val();
+		
 		$.ajax({
-		   url: '/pages/upload.php?type=frmCSVImport&step=upload',
-		   type: 'POST',
-		   data: fd,
-		   contentType: false,
-		   processData: false,
-				 cache: false,
-		   success: function(response){
-			 if(response != 0){
-				$("#CSVImportMsg").html('');
-				$("#step_upload").html(response);
-				$("#btnImport").show();
+		  url: "/pages/upload.php?type=frmCSVImport&step=import",
+		  method: "POST",
+		  data:{		  
+			  formula_name: formula_name,
+			  formula_profile: formula_profile,
+			  ingredient: ingredient, 
+			  concentration: concentration, 
+			  dilutant: dilutant, 
+			  quantity: quantity
+			  },
+		  beforeSend:function(){
+			$('#btnImport').prop("disabled", true);
+		  },
+		  success:function(data) {
+			  if (data.indexOf('Error:') > -1) {
+				  $('#btnImport').prop("disabled", false);
+				  $('#CSVImportMsg').html(data);
 			  }else{
-				$("#CSVImportMsg").html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><strong>Error:</strong> File upload failed!</div>');
+				$('#btnImport').prop("disabled", false);
+				$('#btnImport').hide();
+				$('#btnCloseCsv').prop('value', 'Close');
+				$('#process_area').css('display', 'none');
+				$('#CSVImportMsg').html(data);
+				reload_formulas_data();
 			  }
-		},
-	 });
-	}else{
-		$("#CSVImportMsg").html('<div class="alert alert-danger">Please select a file to upload!</div>');
-	}
-});
-
-
-var total_selection = 0;
-var ingredient = 0;
-var concentration = 0;
-var dilutant = 0;
-var quantity = 0;
-
-var column_data = [];
-
-$(document).on('change', '.set_column_data', function(){
-    var column_name = $(this).val();
-    var column_number = $(this).data('column_number');
-    if(column_name in column_data) {
-	  $('#CSVImportMsg').html('<div class="alert alert-danger"><strong>'+column_name+'</strong> is already assigned.</div>');
-      $(this).val('');
-      return false;
-    }else{
-		$('#CSVImportMsg').html('');
-	}
-
-    if(column_name != '') {
-      column_data[column_name] = column_number;
-    } else {
-      const entries = Object.entries(column_data);
-
-      for(const [key, value] of entries) {
-        if(value == column_number) {
-          delete column_data[key];
-        }
-      }
-    }
-
-    total_selection = Object.keys(column_data).length;
-
-    if(total_selection == 4) {
-		$('#btnImport').prop("disabled", false);
-        ingredient = column_data.ingredient;
-		concentration = column_data.concentration;
-		dilutant = column_data.dilutant;
-		quantity = column_data.quantity;
-    } else {
-		$('#btnImport').prop("disabled", true);
-    }
-
-  });
-
-$(document).on('click', '#btnImport', function(event){
-
-    event.preventDefault();
-   	var formula_name = $('#CSVname').val();
-    var formula_profile = $('#CSVProfile').val();
-	
-    $.ajax({
-      url: "/pages/upload.php?type=frmCSVImport&step=import",
-      method: "POST",
-      data:{		  
-	  	  formula_name: formula_name,
-		  formula_profile: formula_profile,
-		  ingredient: ingredient, 
-		  concentration: concentration, 
-		  dilutant: dilutant, 
-		  quantity: quantity
-		  },
-      beforeSend:function(){
-        $('#btnImport').prop("disabled", true);
-      },
-      success:function(data) {
-		  if (data.indexOf('Error:') > -1) {
-			  $('#btnImport').prop("disabled", false);
-			  $('#CSVImportMsg').html(data);
-		  }else{
-			$('#btnImport').prop("disabled", false);
-			$('#btnImport').hide();
-			$('#btnCloseCsv').prop('value', 'Close');
-			$('#process_area').css('display', 'none');
-			$('#CSVImportMsg').html(data);
-			reload_formulas_data();
 		  }
-      }
-    })
-
-  });
-  
-function reload_formulas_data() {
-    $('#all-table').DataTable().ajax.reload(null, true);
-};
-
-$('#close_export_json').click(function() {
-	$('#JSONExportMsg').html('');
-});
-
-$('#add_formula_cat').on('click', '[id*=add-fcat]', function () {
-
-	$.ajax({ 
-		url: '/pages/update_settings.php', 
-			type: 'POST',
-			data: {
-				manage: 'add_frmcategory',
-				category: $("#fcatName").val(),
-				cat_type: 'profile',
-			},
-		dataType: 'json',
-		success: function (data) {
-			if(data.error){
-				msg = '<div class="alert alert-danger">'+data.error+'</div>';
-			}else if(data.success){
-				$('#add_formula_cat').modal('toggle');
-				$('.modal-backdrop').hide();
-				list_formulas();
+		})
+	
+	  });
+	  
+	function reload_formulas_data() {
+		$('#all-table').DataTable().ajax.reload(null, true);
+	};
+	
+	$('#close_export_json').click(function() {
+		$('#JSONExportMsg').html('');
+	});
+	
+	$('#add_formula_cat').on('click', '[id*=add-fcat]', function () {
+	
+		$.ajax({ 
+			url: '/pages/update_settings.php', 
+				type: 'POST',
+				data: {
+					manage: 'add_frmcategory',
+					category: $("#fcatName").val(),
+					cat_type: 'profile',
+				},
+			dataType: 'json',
+			success: function (data) {
+				if(data.error){
+					msg = '<div class="alert alert-danger">'+data.error+'</div>';
+				}else if(data.success){
+					$('#add_formula_cat').modal('toggle');
+					$('.modal-backdrop').hide();
+					list_formulas();
+				}
+				$('#fcatMsg').html(msg);
 			}
-			$('#fcatMsg').html(msg);
-		}
+		});
 	});
-});
-
-$("#getFormMeta").on("show.bs.modal", function(e) {
-  const id = e.relatedTarget.dataset.id;
-  const formula = e.relatedTarget.dataset.formula;
-
-  $.get("/pages/getFormMeta.php?id=" + id)
-    .then(data => {
-      $("#getFormMetaLabel", this).html(formula);
-      $(".modal-body", this).html(data);
-	  $("#msg_settings_info", this).html('');
-    });
 	
-});
+	$("#getFormMeta").on("show.bs.modal", function(e) {
+	  const id = e.relatedTarget.dataset.id;
+	  const formula = e.relatedTarget.dataset.formula;
+	
+	  $.get("/pages/getFormMeta.php?id=" + id)
+		.then(data => {
+		  $("#getFormMetaLabel", this).html(formula);
+		  $(".modal-body", this).html(data);
+		  $("#msg_settings_info", this).html('');
+		});
+		
+	});
+	
+	$("#formula-name").keyup(function(){
+		var currentText = $(this).val();
+		if (currentText == ""){
+			currentText = "Add new formula";
+		}
+		$("#new-formula-name").text(currentText);
+	});
 
-$("#formula-name").keyup(function(){
-	var currentText = $(this).val();
-	if (currentText == ""){
-		currentText = "Add new formula";
-	}
-    $("#new-formula-name").text(currentText);
 });
-
 </script>
 
 <!--GEN QRCODE MODAL-->            
diff --git a/pages/listIngredients.php b/pages/listIngredients.php
index e95dc04e..88152950 100644
--- a/pages/listIngredients.php
+++ b/pages/listIngredients.php
@@ -61,7 +61,7 @@
 	</div>
 </div>
 
-<table id="tdDataIng" class="table table-striped table-bordered" style="width:100%">
+<table id="tdDataIng" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Name</th>
@@ -85,7 +85,7 @@
 	var tdDataIng = $('#tdDataIng').DataTable( {
 	columnDefs: [
 		{ className: 'pv_vertical_middle text-center', targets: '_all' },
-		{ orderable: false, targets: [1,5,6,7,8,9]},
+		{ orderable: false, targets: [1,2,5,6,7,8,9]},
 		{ responsivePriority: 1, targets: 0 }
 	],
 	search: {
@@ -289,13 +289,13 @@ function iDocs(data, type, row){
 function actions(data, type, row, meta){
 	if(meta.settings.json.source == 'PVOnline'){
 		data = '<div class="dropdown">' +
-			'<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+			'<button type="button" class="btn" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
 				'<ul class="dropdown-menu dropdown-menu-right">' + 
-				'<li><a rel="tip" title="Import '+ row.name +'" class="pv_point_gen text-dark" id="impIng" data-name="'+ row.name +'" data-id='+ row.id +'><i class="fas fa-download mx-2"></i>Import to local DB</a></li>'; 
+				'<li><a rel="tip" title="Import '+ row.name +'" class="pv_point_gen" id="impIng" data-name="'+ row.name +'" data-id='+ row.id +'><i class="fas fa-download mx-2"></i>Import to local DB</a></li>'; 
 		data += '</ul></div>';		
 	}else{//Treat the rest as local
 		data = '<div class="dropdown">' +
-			'<button type="button" class="btn btn-primary btn-floating dropdown-toggle hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+			'<button type="button" class="btn btn-floating hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
 				'<ul class="dropdown-menu dropdown-menu-right">';
 		data += '<li><a href="/pages/mgmIngredient.php?id='+btoa(row.name)+'" class="dropdown-item popup-link"><i class="fas fa-edit mx-2"></i>Manage</a></li>';
 		
diff --git a/pages/makeFormula.php b/pages/makeFormula.php
index 1182ee04..f85fe6cf 100644
--- a/pages/makeFormula.php
+++ b/pages/makeFormula.php
@@ -34,7 +34,7 @@
 
 ?>
 <!doctype html>
-<html lang="en" data-bs-theme="light">
+	<html lang="en" data-bs-theme="<?=$settings['bs_theme']?>">
     <head>
 	  <meta charset="utf-8">
       <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -91,7 +91,7 @@
                <li><a class="dropdown-item" href="#" id="print"><i class="fa-solid fa-print mx-2"></i>Print Formula</a></li>
             </div>
         </div>
-            <table class="table table-bordered" id="tdDataPending" width="100%" cellspacing="0">
+            <table class="table table-striped" id="tdDataPending" width="100%" cellspacing="0">
               <thead>
                 <tr>
                   <th>Ingredient</th>
diff --git a/pages/manageFormula.php b/pages/manageFormula.php
index 6a5f6b6d..da733564 100644
--- a/pages/manageFormula.php
+++ b/pages/manageFormula.php
@@ -303,6 +303,9 @@
 			$response['success'] = '<strong>'.$quantity.$settings['mUnit'].'</strong> of <strong>'.$ingredient['name'].'</strong> added to the formula!';
 			echo json_encode($response);
 			return;
+		} else {
+			$response['error'] = 'Something went wrong, '.mysqli_error($conn);
+			echo json_encode($response);
 		}
 		
 	}
diff --git a/pages/mgmIngredient.php b/pages/mgmIngredient.php
index 8e5d8378..cb277d07 100755
--- a/pages/mgmIngredient.php
+++ b/pages/mgmIngredient.php
@@ -28,7 +28,7 @@
 
 ?>
 <!doctype html>
-<html lang="en">
+<html lang="en" data-bs-theme="<?=$settings['bs_theme']?>">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="icon" type="image/png" sizes="32x32" href="/img/favicon-32x32.png">
@@ -87,7 +87,7 @@
 				<div class="btn-group">
 					<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
 					<div class="dropdown-menu">
-						<li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#cloneIng"><i class="fa-solid fa-copy mx-2"></i>Clone ingredient</a></li>
+						<li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#cloneIng"><i class="fa-solid fa-copy mx-2"></i>Duplicate ingredient</a></li>
 						<li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#renameIng"><i class="fa-regular fa-pen-to-square mx-2"></i>Rename ingredient</a></li>
                         <li><a class="dropdown-item" href="/pages/export.php?format=json&kind=single-ingredient&id=<?=$ing['id']?>"><i class="fas fa-download mx-2"></i>Export as JSON</a></li>
 						<li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#genDOC"><i class="fa-solid fa-file-prescription mx-2"></i>Generate document</a></li>
@@ -267,12 +267,12 @@
         </div>
     </div>
 
-<!-- Modal Clone-->
+<!-- Modal Duplicate-->
 <div class="modal fade" id="cloneIng" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="cloneIng" aria-hidden="true">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
-				<h5 class="modal-title">Clone ingredient <?php echo $ing['name']; ?></h5>
+				<h5 class="modal-title">Duplicate ingredient <?php echo $ing['name']; ?></h5>
 			</div>
 			<div class="modal-body">
 				<div id="clone_msg"></div>
@@ -280,7 +280,7 @@
 				<input class="form-control" name="cloneIngName" id="cloneIngName" type="text" value="" />            
 				<div class="modal-footer">
 					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
-					<input type="submit" name="button" class="btn btn-primary" id="cloneME" value="Clone">
+					<input type="submit" name="button" class="btn btn-primary" id="cloneME" value="Duplicate">
 				</div>
 			</div>
 		</div>
@@ -297,7 +297,7 @@
 			<div class="modal-body">
             	<div id="warn"><div class="alert alert-warning"><strong>Warning:</strong> If you rename the ingredient, will affect any formulas that using it as well. Please refer to <strong>Where Used</strong> section to get a list of formulas if any.</div></div>
 				<div id="rename_msg"></div>
-				Name
+				New name
 				<input class="form-control" name="renameIngName" id="renameIngName" type="text" value="" />            
 				<div class="modal-footer">
 					<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
diff --git a/pages/pubChem.php b/pages/pubChem.php
deleted file mode 100644
index f056b08d..00000000
--- a/pages/pubChem.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-if(!$_GET['cas']){
-	echo 'Error: Missing CAS number';
-	return;
-}
-define('__ROOT__', dirname(dirname(__FILE__))); 
-
-require_once(__ROOT__.'/inc/sec.php');
-require_once(__ROOT__.'/inc/opendb.php');
-require_once(__ROOT__.'/inc/settings.php');
-require_once(__ROOT__.'/func/pvFileGet.php');
-
-$cas = trim($_GET['cas']);
-$type = 'PNG';
-
-if(preg_match('/(Mixture|Blend)/i', $cas) === 1){	
-	echo  '<div class="alert alert-info">Data not available for mixtures</div>';
-	return;
-}
-
-$properties = 'MolecularFormula,MolecularWeight,XLogP,IUPACName,CanonicalSMILES,ExactMass';
-
-$p = base64_encode(pv_file_get_contents($pubChemApi.'/pug/compound/name/'.$cas.'/'.$type.'?record_type='.$settings['pubchem_view'].'&image_size=large'));
-
-if(!$p){//FALL BACK TO 2D	
-	$p = base64_encode(pv_file_get_contents($pubChemApi.'/pug/compound/name/'.$cas.'/'.$type.'?record_type=2d&image_size=large'));
-}
-$image = 'data:image/png;base64,'.$p;
-
-$data = json_decode(trim(pv_file_get_contents($pubChemApi.'/pug/compound/name/'.$cas.'/property/'.$properties.'/JSON')),true);
-
-$molecularWeight = $data['PropertyTable']['Properties']['0']['MolecularWeight'];
-$logP = $data['PropertyTable']['Properties']['0']['XLogP'];
-$molecularFormula = $data['PropertyTable']['Properties']['0']['MolecularFormula'];
-$InChI = $data['PropertyTable']['Properties']['0']['IUPACName'];
-$CanonicalSMILES = $data['PropertyTable']['Properties']['0']['CanonicalSMILES'];
-$ExactMass = $data['PropertyTable']['Properties']['0']['ExactMass'];
-
-if(empty($data)){
-	echo  '<div class="alert alert-info">Data not available</div>';
-	return;
-}
-?>
-<script>
-$(document).ready(function(){
-  
-$('#pubChemDataJ').on('click', '[id*=btnUpdatePub]', function () {
-	$.ajax({ 
-		url: 'update_data.php', 
-		type: 'POST',
-		data: {
-			pubChemData: 'update',
-			molecularWeight: "<?=$molecularWeight?>",
-			logP: "<?=$logP?>",
-			molecularFormula: "<?=$molecularFormula?>",
-			InChI: "<?=$InChI?>",
-			CanonicalSMILES: "<?=$CanonicalSMILES?>",
-			ExactMass: "<?=$ExactMass?>",
-			cas: "<?=$cas?>",
-			},
-		dataType: 'html',
-		success: function (data) {
-			$('#ingMsg').html(data);
-			$("#INCI").val("<?=$InChI?>");
-			reload_overview();
-		}
-	  });             
-});
-     
-});
-</script>
-<table width="100%" border="0" id="pubChemDataJ">
-  <tr>
-    <td width="20%" rowspan="7" valign="top"><img src="<?php echo $image;?>"/></td>
-    <td width="34%">Molecular Formula:</td>
-    <td width="46%"><strong><?php echo $molecularFormula;?></strong></td>
-  </tr>
-  <tr>
-    <td>Molecular Weight:</td>
-    <td><strong><?php echo $molecularWeight;?></strong></td>
-  </tr>
-  <tr>
-    <td>Canonical Smiles:</td>
-    <td><strong><?php echo $CanonicalSMILES;?></strong></td>
-  </tr>
-  <tr>
-    <td>Mass:</td>
-    <td><strong><?php echo $ExactMass;?></strong></td>
-  </tr>
-  <tr>
-    <td>XLogP:</td>
-    <td><strong><?php echo $logP;?></strong></td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td colspan="2"><input type="submit" class="btn btn-info" name="btnUpdatePub" id="btnUpdatePub" value="Update data" /></td>
-  </tr>
-  <tr>
-   <td colspan="2">&nbsp;</td>
-</tr>
-</table>
diff --git a/pages/scheduledFormulas.php b/pages/scheduledFormulas.php
index c3734be2..e0746d3c 100644
--- a/pages/scheduledFormulas.php
+++ b/pages/scheduledFormulas.php
@@ -8,7 +8,7 @@
   <div>
   <div class="card shadow mb-4">
     <div class="card-header py-3">
-      <h2 class="m-0 font-weight-bold text-primary"><a href="#" id="mainTitle">Scheduled Formulas</a></h2>
+      <h2 class="m-0 font-weight-bold text-primary-emphasis"><a href="#" id="mainTitle">Scheduled Formulas</a></h2>
     </div>
     <div class="pv_menu_formulas">
         <div class="text-right">
@@ -25,14 +25,14 @@
     </div>
     <div class="card-body">
       <div class="table-responsive">
-        <table class="table table-bordered" id="tdDataScheduled" width="100%" cellspacing="0">
+        <table class="table table-striped" id="tdDataScheduled" width="100%" cellspacing="0">
           <thead>
             <tr>
               <th>Formula Name</th>
               <th>Ingredients Pending</th>
               <th>Progress</th>
               <th>Scheduled</th>
-              <th>Actions</th>
+              <th></th>
             </tr>
           </thead>
         </table>
@@ -76,37 +76,37 @@
 				}
 			},
 		},
-	   columns: [
+	columns: [
             { data : 'name', title: 'Formula Name', render: name },
 			{ data : null, title: 'Ingredients remaining', render: ingredients },
 			{ data : 'madeOn', title: 'Progress', render: progress },
 			{ data : 'scheduledOn', title: 'Scheduled', render: fDate },
-			{ data : null, title: 'Actions', render: actions },
+			{ data : null, title: '', render: actions },
 		],
-		order: [[ 0, 'asc' ]],
-		lengthMenu: [[20, 50, 100, 200, 400], [20, 50, 100, 200, 400]],
-		pageLength: 20,
-		displayLength: 20,
-		stateSave: true,
-		stateDuration: -1,
-		stateLoadCallback: function (settings, callback) {
-			$.ajax( {
-				url: '/core/update_user_settings.php?set=listTodo&action=load',
-				dataType: 'json',
-				success: function (json) {
-					callback( json );
-				}
-			});
-		},
-		stateSaveCallback: function (settings, data) {
-		   $.ajax({
-			 url: "/core/update_user_settings.php?set=listTodo&action=save",
-			 data: data,
-			 dataType: "json",
-			 type: "POST"
-		  });
-		},
-  	});
+	order: [[ 0, 'asc' ]],
+	lengthMenu: [[20, 50, 100, 200, 400], [20, 50, 100, 200, 400]],
+	pageLength: 20,
+	displayLength: 20,
+	stateSave: true,
+	stateDuration: -1,
+	stateLoadCallback: function (settings, callback) {
+		$.ajax( {
+			url: '/core/update_user_settings.php?set=listTodo&action=load',
+			dataType: 'json',
+			success: function (json) {
+				callback( json );
+			}
+		});
+	},
+	stateSaveCallback: function (settings, data) {
+	   $.ajax({
+		 url: "/core/update_user_settings.php?set=listTodo&action=save",
+		 data: data,
+		 dataType: "json",
+		 type: "POST"
+	  });
+	},
+  });
 	
 	$("#required_materials").on("show.bs.modal", function(e) {
 		const id = e.relatedTarget.dataset.id;
@@ -117,113 +117,115 @@
 				$(".modal-body", this).html(data);
 		});
 	});
-}); //END DOC
 
-function progress(data, type, row){
+
+	function progress(data, type, row){
+		
+		const perc = Math.round(100 - (row.total_ingredients_left / row.total_ingredients) * 100);
+		const nowVal = row.total_ingredients_left;
+		const maxVal = row.total_ingredients;
+		
+		if(perc != 0){
+			data = '<div class="progress">' + 
+				  '<div class="progress-bar progress-bar-striped bg-info" role="progressbar" style="width: '+perc+'%;" aria-valuenow="'+nowVal+'" aria-valuemin="0" aria-valuemax="100">'+perc+'% Complete</div>' +
+				'</div>';
+		}else{
+			data = '<i class="fas fa-hourglass-start" rel="tip" title="Not started yet"></i>';
+		}
+		return data;
+	}
 	
- 	const perc = Math.round(100 - (row.total_ingredients_left / row.total_ingredients) * 100);
- 	const nowVal = row.total_ingredients_left;
-	const maxVal = row.total_ingredients;
+	function name(data, type, row){
+		
+		data ='<div class="btn-group"><a href="#" class="dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">'+row.name+'</a><div class="dropdown-menu dropdown-menu-right">';
+		
+		data+='<li><a class="dropdown-item" href="/pages/makeFormula.php?fid='+ row.fid +'" target="_blank"><i class="fa-solid fa-flask-vial mx-2"></i>Make formula</a></li>';
 	
-	if(perc != 0){
-		data = '<div class="progress">' + 
-			  '<div class="progress-bar progress-bar-striped bg-info" role="progressbar" style="width: '+perc+'%;" aria-valuenow="'+nowVal+'" aria-valuemin="0" aria-valuemax="100">'+perc+'% Complete</div>' +
-			'</div>';
-	}else{
-		data = '<i class="fas fa-hourglass-start" rel="tip" title="Not started yet"></i>';
+		data+='<li><a class="dropdown-item" href="/?do=Formula&id='+row.id+'" target="_blank"><i class="fa-solid fa-flask mx-2"></i>Go to formula</a></li>';
+							
+		data+='</div></div>';
+		return data;
 	}
-	return data;
-}
-
-function name(data, type, row){
 	
-	data ='<div class="btn-group"><a href="#" class="dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">'+row.name+'</a><div class="dropdown-menu dropdown-menu-right">';
+	function ingredients(data, type, row){
+		data = row.total_ingredients_left + '/' + row.total_ingredients ;	
+		return data;
+	}
 	
-	data+='<li><a class="dropdown-item" href="/pages/makeFormula.php?fid='+ row.fid +'" target="_blank"><i class="fa-solid fa-flask-vial mx-2"></i>Make formula</a></li>';
-
-	data+='<li><a class="dropdown-item" href="/?do=Formula&id='+row.id+'" target="_blank"><i class="fa-solid fa-flask mx-2"></i>Go to formula</a></li>';
-		                
-	data+='</div></div>';
-	return data;
-}
-
-function ingredients(data, type, row){
-	data = row.total_ingredients_left + '/' + row.total_ingredients ;	
-	return data;
-}
-
-function fDate(data, type, row, meta){
-  if(type === 'display'){
-    if(data == '0000-00-00 00:00:00'){
-      data = '-';
-    }else{
-	    let dateTimeParts= data.split(/[- :]/); 
-		dateTimeParts[1]--; 
-		const dateObject = new Date(...dateTimeParts); 
-        data = dateObject.toLocaleDateString() + " " + dateObject.toLocaleTimeString();
-    }
-  }
-  return data;
-}
-
-function actions(data, type, row){
-	return '<i rel="tip" title="Delete '+ row.name +'" class="pv_point_gen fas fa-trash" style="color: #c9302c;" id="pend_remove" data-name="'+ row.name +'" data-id='+ row.fid +'></i>';    
-}
-
-function reload_data() {
-    $('#tdDataScheduled').DataTable().ajax.reload(null, true);
-}
-
-
-$('#tdDataScheduled').on('click', '[id*=pend_remove]', function () {
-	var frm = {};
-	frm.ID = $(this).attr('data-id');
-	frm.Name = $(this).attr('data-name');
-    
-	bootbox.dialog({
-       title: "Confirm removal",
-       message : "Remove formula <strong>" + frm.Name + "</strong> from scheduled formulas? <br />Your original formula will not be affected but any progress of making the formula will be lost.",
-       buttons :{
-           main: {
-               label : "Remove",
-               className : "btn-danger",
-               callback: function (){
-			   $.ajax({
-					url: '/pages/manageFormula.php', 
-					type: 'POST',
-					data: {
-						action: 'todo',
-						fid: frm.ID,
-						name: frm.Name,
-						remove: true,
-						},
-					dataType: 'json',
-					success: function (data) {
-						if ( data.success ) {
-            				$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-							$('.toast-header').removeClass().addClass('toast-header alert-success');
-							reload_data();
-						} else {
-							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
-							$('.toast-header').removeClass().addClass('toast-header alert-danger');
+	function fDate(data, type, row, meta){
+	  if(type === 'display'){
+		if(data == '0000-00-00 00:00:00'){
+		  data = '-';
+		}else{
+			let dateTimeParts= data.split(/[- :]/); 
+			dateTimeParts[1]--; 
+			const dateObject = new Date(...dateTimeParts); 
+			data = dateObject.toLocaleDateString() + " " + dateObject.toLocaleTimeString();
+		}
+	  }
+	  return data;
+	}
+	
+	function actions(data, type, row){
+		return '<i rel="tip" title="Delete '+ row.name +'" class="pv_point_gen fas fa-trash text-danger" id="pend_remove" data-name="'+ row.name +'" data-id='+ row.fid +'></i>';    
+	}
+	
+	function reload_data() {
+		$('#tdDataScheduled').DataTable().ajax.reload(null, true);
+	}
+	
+	
+	$('#tdDataScheduled').on('click', '[id*=pend_remove]', function () {
+		var frm = {};
+		frm.ID = $(this).attr('data-id');
+		frm.Name = $(this).attr('data-name');
+		
+		bootbox.dialog({
+		   title: "Confirm removal",
+		   message : "Remove formula <strong>" + frm.Name + "</strong> from scheduled formulas? <br />Your original formula will not be affected but any progress of making the formula will be lost.",
+		   buttons :{
+			   main: {
+				   label : "Remove",
+				   className : "btn-danger",
+				   callback: function (){
+				   $.ajax({
+						url: '/pages/manageFormula.php', 
+						type: 'POST',
+						data: {
+							action: 'todo',
+							fid: frm.ID,
+							name: frm.Name,
+							remove: true,
+							},
+						dataType: 'json',
+						success: function (data) {
+							if ( data.success ) {
+								$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+								$('.toast-header').removeClass().addClass('toast-header alert-success');
+								reload_data();
+							} else {
+								$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
+								$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							}
+							$('.toast').toast('show');
 						}
-						$('.toast').toast('show');
-					}
-				});
-				
-                 return true;
-               }
-           },
-           cancel: {
-               label : "Cancel",
-               className : "btn-secondary",
-               callback : function() {
-                   return true;
-               }
-           }   
-       },onEscape: function () {return true;}
-   });
-});
+					});
+					
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
+
+}); //END DOC
 </script>
 <!-- IMPORT JSON MODAL -->
 <div class="modal fade" id="import_making_json" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="import_making_json" aria-hidden="true">
diff --git a/pages/sellFormula.php b/pages/sellFormula.php
index dfd9db62..3ff7c2ce 100644
--- a/pages/sellFormula.php
+++ b/pages/sellFormula.php
@@ -5,71 +5,112 @@
     <div>
       <div class="card shadow mb-4">
         <div class="card-header py-3"> 
-           <h2 class="m-0 font-weight-bold text-primary">Sell Formula</h2>
+           <h2 class="m-0 font-weight-bold text-primary-emphasis">Sell Formula</h2>
     	</div>
 	<div class="card-body">
-        <table width="100%" border="0">
-          <tr>
-            <td width="10%">Formula</td>
-            <td width="90%">
-            <select id="formulaID" class="form-control selectpicker" data-live-search="true">
-             <?php
-             $sql = mysqli_query($conn, "SELECT id,name,product_name FROM formulasMetaData ORDER BY name ASC");
-             while ($formula = mysqli_fetch_array($sql)){
-                echo '<option value="'.$formula['id'].'">'.$formula['name'].' ('.$formula['product_name'].')</option>';
-             }
-             ?>
-             </select>
-           </td>
-          </tr>
-
-          <tr>
-            <td>Customer</td>
-            <td>
-              <select id="customerID" class="form-control selectpicker" data-live-search="true">
-               <?php
-               $res = mysqli_query($conn, "SELECT id, name FROM customers ORDER BY name ASC");
-               while ($q = mysqli_fetch_array($res)){
-					echo '<option value="'.$q['name'].'">'.$q['name'].'</option>';
-                }
-                ?>
+ 
+        <div class="row mb-3">
+          <!-- Column 1 -->
+          <div class="col-md-6">
+            <div class="row mb-3">
+              <label for="formulaID" class="col-form-label">Formula</label>
+              <div class="col-sm-9">
+                <select id="formulaID" class="form-control selectpicker" data-live-search="true">
+                  <?php
+                  $sql = mysqli_query($conn, "SELECT id, name, product_name FROM formulasMetaData ORDER BY name ASC");
+                  while ($formula = mysqli_fetch_array($sql)){
+                    echo '<option value="'.$formula['id'].'">'.$formula['name'].' ('.$formula['product_name'].')</option>';
+                  }
+                  ?>
+                </select>
+              </div>
+            </div>
+        
+            <div class="row mb-3">
+              <label for="customerID" class="col-form-label">Customer</label>
+              <div class="col-sm-9">
+                <select id="customerID" class="form-control selectpicker" data-live-search="true">
+                  <?php
+                  $res = mysqli_query($conn, "SELECT id, name FROM customers ORDER BY name ASC");
+                  while ($q = mysqli_fetch_array($res)){
+                    echo '<option value="'.$q['name'].'">'.$q['name'].'</option>';
+                  }
+                  ?>
+                </select>
+              </div>
+            </div>
+        
+            <div class="row mb-3">
+              <label for="orientation" class="col-form-label">PDF Orientation</label>
+              <div class="col-sm-9">
+                <select name="orientation" class="form-control" id="orientation">
+                  <option value="portrait">Portrait</option>
+                  <option value="landscape">Landscape</option>
                 </select>
-              </td>
-          </tr>
-          <tr>
-            <td>PDF Orientation</td>
-            <td colspan="2"><select name="orientation" class="form-control" id="orientation">
-              <option value="p">Portrait</option>
-              <option value="l">Landscaspe</option>
-            </select></td>
-          </tr>
-          <tr>
-            <td>Watermark</td>
-            <td colspan="2"><input class="mb-2 form-control" name="watermarkText" type="text" id="watermarkText" value="CONFIDENTIAL"></td>
-          </tr>
-          <tr>
-            <td>Watermark size</td>
-            <td colspan="2"><select name="watermarkTextSize" class="form-control" id="watermarkTextSize">
-              <option value="50">50</option>
-              <option value="100" selected="selected">100</option>
-              <option value="200">200</option>
-            </select></td>
-          </tr>
-          <tr>
-            <td>Quantity Decimal</td>
-            <td>
-              <select name="qStep" id="qStep" class="form-control">
-                <option value="1" <?php if($settings['qStep']=="1") echo 'selected="selected"'; ?> >0.0</option>
-                <option value="2" <?php if($settings['qStep']=="2") echo 'selected="selected"'; ?> >0.00</option>
-                <option value="3" <?php if($settings['qStep']=="3") echo 'selected="selected"'; ?> >0.000</option>
-                <option value="4" <?php if($settings['qStep']=="4") echo 'selected="selected"'; ?> >0.0000</option>
-              </select>
-           </td>
-          </tr>
-          <tr>
-            <td><input type="submit" name="button" class="btn btn-info" id="btnGEN" value="Generate"></td>
-          </tr>
-        </table> 
+              </div>
+            </div>
+        
+            <div class="row mb-3">
+              <label for="watermarkText" class="col-form-label">Watermark</label>
+              <div class="col-sm-9">
+                <input class="form-control" name="watermarkText" type="text" id="watermarkText" value="CONFIDENTIAL">
+              </div>
+            </div>
+          </div>
+        
+          <!-- Column 2 -->
+          <div class="col-md-6">
+            <div class="row mb-3">
+              <label for="watermarkTextOp" class="col-form-label">Watermark opacity</label>
+              <div class="col-sm-9">
+                <select name="watermarkTextOp" class="form-control" id="watermarkTextOp">
+                  <option value="0.1">0.1</option>
+                  <option value="0.2" selected="selected">0.2</option>
+                  <option value="0.3">0.3</option>
+                </select>
+              </div>
+            </div>
+        
+            <div class="row mb-3">
+              <label for="fontSize" class="col-form-label">PDF font size</label>
+              <div class="col-sm-9">
+                <input class="form-control" name="fontSize" type="text" id="fontSize" value="8">
+              </div>
+            </div>
+        
+            <div class="row mb-3">
+              <label for="logoSizeW" class="col-form-label">Logo width (px)</label>
+              <div class="col-sm-9">
+                <input class="form-control" name="logoSizeW" type="text" id="logoSizeW" value="200">
+              </div>
+            </div>
+        
+            <div class="row mb-3">
+              <label for="logoSizeH" class="col-form-label">Logo height (px)</label>
+              <div class="col-sm-9">
+                <input class="form-control" name="logoSizeH" type="text" id="logoSizeH" value="200">
+              </div>
+            </div>
+        
+            <div class="row mb-3">
+              <label for="qStep" class="col-form-label">Quantity Decimal</label>
+              <div class="col-sm-9">
+                <select name="qStep" id="qStep" class="form-control">
+                  <option value="1" <?php if($settings['qStep']=="1") echo 'selected="selected"'; ?>>0.0</option>
+                  <option value="2" <?php if($settings['qStep']=="2") echo 'selected="selected"'; ?>>0.00</option>
+                  <option value="3" <?php if($settings['qStep']=="3") echo 'selected="selected"'; ?>>0.000</option>
+                  <option value="4" <?php if($settings['qStep']=="4") echo 'selected="selected"'; ?>>0.0000</option>
+                </select>
+              </div>
+            </div>
+          </div>
+        </div>
+          <div class="row mb-3">
+            <div class="col-sm-1">
+              <input type="submit" name="button" class="btn btn-primary" id="btnGEN" value="Generate">
+            </div>
+          </div>
+
       </div>
      </div>
     </div>
@@ -77,22 +118,27 @@
    </div>
   </div>
 <script>
-$('#btnGEN').click(function() {
-	$.ajax({ 
-		url: '/pages/views/formula/sell_formula.php', 
-		type: 'POST',
-		data: {
-			id: $("#formulaID").val(),
-			watermarkText: $("#watermarkText").val(),
-			watermarkTextSize: $("#watermarkTextSize").val(),
-			orientation: $("#orientation").val(),
-			qStep: $("#qStep").val()
-		},
-		dataType: 'html',
-		success: function (data) {
-			$('#results').html(data);
-		}
-	  });
+$(document).ready(function() {
+	$('#btnGEN').click(function() {
+		$.ajax({ 
+			url: '/pages/views/formula/sell_formula.php', 
+			type: 'POST',
+			data: {
+				id: $("#formulaID").val(),
+				watermarkText: $("#watermarkText").val(),
+				watermarkTextOp: $("#watermarkTextOp").val(),
+				orientation: $("#orientation").val(),
+				qStep: $("#qStep").val(),
+				fontSize: $("#fontSize").val(),
+				logoSizeW: $("#logoSizeW").val(),
+				logoSizeH: $("#logoSizeH").val(),
+			},
+			dataType: 'html',
+			success: function (data) {
+				$('#results').html(data);
+			}
+		  });
+	});
 });
 
 </script>
diff --git a/pages/settings.php b/pages/settings.php
index 989fb81b..eda695e2 100755
--- a/pages/settings.php
+++ b/pages/settings.php
@@ -12,7 +12,7 @@
 </script>
 <div class="container-fluid">
 
-<h2 class="m-0 mb-4 text-primary"><a href="/?do=settings">Settings</a></h2>
+<h2 class="m-0 mb-4"><a href="/?do=settings">Settings</a></h2>
 <div id="settings">
      <ul>
          <li class="active"><a href="#general" id="general_tab" role="tab" data-bs-toggle="tab">General</a></li>
diff --git a/pages/statistics.php b/pages/statistics.php
index ac0a4713..c24fb956 100755
--- a/pages/statistics.php
+++ b/pages/statistics.php
@@ -53,13 +53,13 @@ function fetch_ingUsage(){
 }
 </style>
 
-<script src="js/amcharts_3.21.15.free/amcharts/amcharts.js"></script>
-<script src="js/amcharts_3.21.15.free/amcharts/serial.js"></script>
-<script src="js/amcharts_3.21.15.free/amcharts/pie.js"></script>
-<script src="js/amcharts_3.21.15.free/amcharts/themes/light.js"></script>
+<script src="/js/amcharts_3.21.15.free/amcharts/amcharts.js"></script>
+<script src="/js/amcharts_3.21.15.free/amcharts/serial.js"></script>
+<script src="/js/amcharts_3.21.15.free/amcharts/pie.js"></script>
+<script src="/js/amcharts_3.21.15.free/amcharts/themes/light.js"></script>
 
 <div class="container-fluid">
-	<h2 class="m-0 mb-4 text-primary">Statistics</h2>
+	<h2 class="m-0 mb-4 text-primary-emphasis">Statistics</h2>
      <div id="statistics">
          <ul>
              <li><a href="#ingUsage_tab"><span>Ingredients Usage</span></a></li>
diff --git a/pages/suppliers.php b/pages/suppliers.php
index 1638ca02..cc2207e6 100644
--- a/pages/suppliers.php
+++ b/pages/suppliers.php
@@ -25,7 +25,7 @@
             </table>
             <div class="card-body">
               <div class="table-responsive">
-                <table class="table table-bordered" id="tdIngSupData" width="100%" cellspacing="0">
+                <table class="table table-striped" id="tdIngSupData" width="100%" cellspacing="0">
                   <thead>
                     <tr>
                       <th>Name</th>
@@ -133,9 +133,9 @@ function description(data, type, row){
 }
 function actions(data, type, row){
 	data = '<div class="dropdown">' +
-			'<button type="button" class="btn btn-primary btn-floating dropdown-toggle hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+			'<button type="button" class="btn btn-floating hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
 				'<ul class="dropdown-menu dropdown-menu-right">';
-	data += '<li><i class="pv_point_gen dropdown-item text-dark" data-bs-toggle="modal" data-bs-target="#details" id="edit_supplier" data-id="' + row.id + '" data-name="' + row.name + '" data-address="'+row.address+'" data-po="'+row.po+'" data-country="'+row.country+'" data-telephone="'+row.telephone+'" data-url="'+row.url+'" data-email="'+row.email+'"><i class="fas fa-edit mx-2"></i>Edit</i></li>';
+	data += '<li><i class="pv_point_gen dropdown-item" data-bs-toggle="modal" data-bs-target="#details" id="edit_supplier" data-id="' + row.id + '" data-name="' + row.name + '" data-address="'+row.address+'" data-po="'+row.po+'" data-country="'+row.country+'" data-telephone="'+row.telephone+'" data-url="'+row.url+'" data-email="'+row.email+'"><i class="fas fa-edit mx-2"></i>Edit</i></li>';
 	data += '<li><a class="dropdown-item" id="json_export" href="/pages/export.php?format=json&kind=supplier-materials&supplier-name='+row.name+'&id='+row.id+'"><i class="fa-solid fa-file-code mx-2"></i>Export materials to JSON</a></li>';
 	data += '<div class="dropdown-divider"></div>';
 	data += '<li><a class="dropdown-item pv_point_gen text-danger" id="dDel" data-name="'+ row.name +'" data-id='+ row.id +'><i class="fas fa-trash mx-2"></i>Delete</a></li>';
diff --git a/pages/update_data.php b/pages/update_data.php
index f904257e..4e0dce1c 100755
--- a/pages/update_data.php
+++ b/pages/update_data.php
@@ -1684,12 +1684,12 @@ function formatVal($num){
 	$old_ing_name = mysqli_real_escape_string($conn, $_POST['old_ing_name']);
 	$new_ing_name = mysqli_real_escape_string($conn, $_POST['new_ing_name']);
 	if(empty($new_ing_name)){
-		$response['error'] = '<strong>Error: </strong>Please enter a name!';
+		$response['error'] = 'Please provide a name';
 		echo json_encode($response);
 		return;
 	}
 	if(mysqli_num_rows(mysqli_query($conn, "SELECT name FROM ingredients WHERE name = '$new_ing_name'"))){
-		$response['error'] = '<strong>Error: </strong>'.$new_ing_name.' already exists!';
+		$response['error'] = $new_ing_name.' already exists';
 		echo json_encode($response);
 		return;
 	}
@@ -1700,7 +1700,7 @@ function formatVal($num){
 
 	if($nID = mysqli_fetch_array(mysqli_query($conn, "SELECT name FROM ingredients WHERE name = '$new_ing_name'"))){
 		
-		$response['success'] = $old_ing_name.' cloned as <a href="/pages/mgmIngredient.php?id='.base64_encode($nID['name']).'" >'.$new_ing_name.'</a>!';
+		$response['success'] = $old_ing_name.' duplicated as <a href="/pages/mgmIngredient.php?id='.base64_encode($nID['name']).'" >'.$new_ing_name.'</a>';
 		echo json_encode($response);
 		return;
 	}
@@ -1717,12 +1717,12 @@ function formatVal($num){
 	$old_ing_name = mysqli_real_escape_string($conn, $_POST['old_ing_name']);
 	$new_ing_name = mysqli_real_escape_string($conn, $_POST['new_ing_name']);
 	if(empty($new_ing_name)){
-		$response['error'] = '<strong>Error: </strong>Please enter a name!';
+		$response['error'] = 'Please provide a name';
 		echo json_encode($response);
 		return;
 	}
 	if(mysqli_num_rows(mysqli_query($conn, "SELECT name FROM ingredients WHERE name = '$new_ing_name'"))){
-		$response['error'] = '<strong>Error: </strong>'.$new_ing_name.' already exists!';
+		$response['error'] = $new_ing_name.' already exists';
 		echo json_encode($response);
 		return;
 	}
@@ -1734,7 +1734,7 @@ function formatVal($num){
 
 	if($nID = mysqli_fetch_array(mysqli_query($conn, "SELECT name FROM ingredients WHERE name = '$new_ing_name'"))){
 		
-		$response['success']['msg'] = $old_ing_name.' renamed to <a href="/pages/mgmIngredient.php?id='.base64_encode($nID['name']).'" >'.$new_ing_name.'</a>!';
+		$response['success']['msg'] = $old_ing_name.' renamed to <a href="/pages/mgmIngredient.php?id='.base64_encode($nID['name']).'" >'.$new_ing_name.'</a>';
 		$response['success']['id'] = base64_encode($nID['name']);
 		echo json_encode($response);
 		return;
diff --git a/pages/update_settings.php b/pages/update_settings.php
index 351c8813..109a3b15 100644
--- a/pages/update_settings.php
+++ b/pages/update_settings.php
@@ -109,6 +109,7 @@
 	$editor = mysqli_real_escape_string($conn, $_POST['editor']);
 	$user_pref_eng = mysqli_real_escape_string($conn, $_POST['user_pref_eng']);
 	$defPercentage =  $_POST['defPercentage'];
+	$bs_theme = $_POST['bs_theme'];
 	
 	if($_POST["chem_vs_brand"] == 'true') {
 		$chem_vs_brand = '1';
@@ -158,8 +159,8 @@
 		return;
 	}
 	
-	if(mysqli_query($conn, "UPDATE settings SET currency = '$currency', top_n = '$top_n', heart_n = '$heart_n', base_n = '$base_n', chem_vs_brand = '$chem_vs_brand', grp_formula = '$grp_formula', pubChem='$pubChem', chkVersion='$chkVersion', qStep = '$qStep', defCatClass = '$defCatClass', pubchem_view = '$pubchem_view', multi_dim_perc = '$multi_dim_perc', mUnit = '$mUnit', editor = '$editor', user_pref_eng = '$user_pref_eng', pv_host = '".$_POST['pv_host']."', defPercentage = '$defPercentage'")){
-		$response["success"] = 'Settings updated!';
+	if(mysqli_query($conn, "UPDATE settings SET currency = '$currency', top_n = '$top_n', heart_n = '$heart_n', base_n = '$base_n', chem_vs_brand = '$chem_vs_brand', grp_formula = '$grp_formula', pubChem='$pubChem', chkVersion='$chkVersion', qStep = '$qStep', defCatClass = '$defCatClass', pubchem_view = '$pubchem_view', multi_dim_perc = '$multi_dim_perc', mUnit = '$mUnit', editor = '$editor', user_pref_eng = '$user_pref_eng', pv_host = '".$_POST['pv_host']."', defPercentage = '$defPercentage', bs_theme = '$bs_theme'")){
+		$response["success"] = 'Settings updated';
 	}else{
 		$response["error"] = 'An error occured '.mysqli_error($conn);	
 	}
@@ -172,7 +173,8 @@
 	$api = $_POST['api'];
 	$api_key = mysqli_real_escape_string($conn, $_POST['api_key']);
 	if(strlen($api_key) < 8){
-		echo '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>API key must be at least 8 characters long.</div>';	
+		$response['error'] =  'API key must be at least 8 characters long';	
+		echo json_encode($response);
 		return;
 	}
 	if($_POST["api"] == 'true') {
@@ -184,7 +186,7 @@
 	if(mysqli_query($conn, "UPDATE settings SET api = '$api', api_key='$api_key'")){
 		$response['success'] = 'API settings updated!';	
 	}else{
-		$response['success'] = 'An error occured '.mysqli_error($conn);	
+		$response['error'] = 'An error occured '.mysqli_error($conn);	
 	}
 	echo json_encode($response);
 	return;
@@ -200,7 +202,7 @@
 	$brandPhone = mysqli_real_escape_string($conn, $_POST['brandPhone']);
 
 	if(mysqli_query($conn, "UPDATE settings SET brandName = '$brandName', brandAddress = '$brandAddress', brandEmail = '$brandEmail', brandPhone = '$brandPhone'")){
-		$response['success'] = 'Brand details updated!';
+		$response['success'] = 'Brand details updated';
 	}else{
 		$response['error'] = 'Error updating brand info';
 	}
diff --git a/pages/viewFormula.php b/pages/viewFormula.php
index 0125a14e..ef1987c7 100644
--- a/pages/viewFormula.php
+++ b/pages/viewFormula.php
@@ -63,11 +63,11 @@
 
 <div id="row pv_search">
 	<div class="text-right">
-    <label for="pvCustomSearch" class="mx-2"><a href="#" class="link-secondary" rel="tip" title="Use comma (,) separated values to search for different ingredients">Search in formula:</a></label>
-    <input type="text" id="pvCustomSearch" placeholder="CAS, Ingredient, etc..">
+    	<label for="pvCustomSearch" class="mx-2"><a href="#" class="link-secondary" rel="tip" title="Use comma (,) separated values to search for different ingredients">Search in formula:</a></label>
+    	<input type="text" id="pvCustomSearch" placeholder="CAS, Ingredient, etc..">
+	</div>
 </div>
-</div>
-<table id="formula" class="table table-striped table-bordered nowrap viewFormula" style="width:100%">
+<table id="formula" class="table table-hover table-striped nowrap viewFormula" style="width:100%">
         <thead class="table-primary">
             <tr>
                 <th>Profile</th>
@@ -128,11 +128,11 @@
 		dom: 'lrtip',
 			buttons: [{
 				extend: 'print',
-				title: "<?=$meta['name']?>",
+				title: myFNAME,
 				exportOptions: {
      				columns: [1, 2, 3, 4, 5, 6, 7, 8, 10]
   				},
-			  }],
+		}],
 		processing: true,
 		mark: false,
 		responsive: false,
@@ -142,25 +142,29 @@
 			emptyTable: '<div class="alert alert-warning"><strong>Empty formula. Please add ingredients.</strong></div>',
 			search: "Search in formula:",
 			searchPlaceholder: "CAS, Ingredient, etc.."
-			},
+		},
     	ajax: {
-    		url: '/core/full_formula_data.php?id=<?=$id?>'
- 		 },
-		 columns: [
-				   { data : 'ingredient.profile', title: 'Profile' },
-				   { data : 'ingredient.name', title: 'Ingredient', render: ingName},
-    			   { data : 'ingredient.cas', title: 'CAS #', render: ingCAS},
-				   { data : 'purity', title: 'Purity %', render: ingConc},
-				   { data : 'dilutant', title: 'Dilutant', render: ingSolvent},
-				   { data : 'quantity', title: 'Quantity (<?=$settings['mUnit']?>)', render: ingQuantity},
-				   { data : 'concentration', title: 'Concentration 100%', render: ingSetConc},
-				   { data : 'final_concentration', title: 'Final Concentration <?=$meta['finalType']?>%'},
-				   { data : 'cost', title: 'Cost (<?=$settings['currency']?>)'},
-				   { data : 'ingredient.inventory.stock', title: 'Inventory', className: 'text-center noexport', render: ingInv },
-				   { data : 'ingredient.desc', title: 'Properties', render: ingNotes},
-   				   { data : null, title: '', className: 'text-center noexport', render: ingActions},		   
+    		url: '/core/full_formula_data.php',
+			type: 'POST',
+			data:{
+		   		id: "<?=$meta['id']?>",
+			}
+ 		},
+		columns: [
+			{ data : 'ingredient.profile', title: 'Profile' },
+			{ data : 'ingredient.name', title: 'Ingredient', render: ingName},
+    		{ data : 'ingredient.cas', title: 'CAS #', render: ingCAS},
+			{ data : 'purity', title: 'Purity %', render: ingConc},
+			{ data : 'dilutant', title: 'Dilutant', render: ingSolvent},
+			{ data : 'quantity', title: 'Quantity (<?=$settings['mUnit']?>)', render: ingQuantity},
+			{ data : 'concentration', title: 'Concentration 100%', render: ingSetConc},
+			{ data : 'final_concentration', title: 'Final Concentration <?=$meta['finalType']?>%'},
+			{ data : 'cost', title: 'Cost (<?=$settings['currency']?>)'},
+			{ data : 'ingredient.inventory.stock', title: 'Inventory', className: 'text-center noexport', render: ingInv },
+			{ data : 'ingredient.desc', title: 'Properties', render: ingNotes},
+   			{ data : null, title: '', className: 'text-center noexport', render: ingActions},		   
 				   
-				  ],
+		],
 		fixedHeader: {
 			"header": true,
             "footer": true
@@ -454,7 +458,7 @@ className : "btn-secondary",
 			type: 'POST',
 			data: {
 				action: "excIng",
-				fid: "<?=$meta['fid']?>",
+				fid: myFID,
 				ingID: ing.ID,
 				ingName: ing.Name,
 				status: ing.Status
@@ -495,7 +499,7 @@ className : "btn-primary",
 					type: 'POST',
 					data: {
 						isMade: "1",
-						fid: "<?=$meta['fid']?>",
+						fid: myFID,
 						},
 					dataType: 'json',
 					success: function (data) {
@@ -535,125 +539,8 @@ function reload_formula_data() {
 $('#print').click(() => {
     $('#formula').DataTable().button(0).trigger();
 });
-</script>
-<!--Schedule Formula-->
-<div class="modal fade" id="schedule_to_make" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="schedule_to_make" aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">Schedule formula to make</h5>
-      </div>
-      <div class="modal-body">
-      <div id="scheduleToMakeMsg"></div>
-      <div class="alert alert-info">This will add the current formulation to scheduled formulas. Any changes in this formula will not be replicated to the scheduled version. If you make changes here, you have to remove it and re-add it for making.</div>
-	    <div class="modal-footer">
-	     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-  		 <input type="submit" name="button" class="btn btn-primary" id="addTODO" value="Schedule Formula">
-	   </div>
-    </div>
-  </div>
- </div>
-</div>
-
-<!--Scale Formula-->
-<div class="modal fade" id="amount_to_make" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="amount_to_make" aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">Scale formula</h5>
-      </div>
-      <div class="modal-body">
-      <div id="amountToMakeMsg"></div>
-      <p>This will re-calculate the ingredients quantity as per the new total.</p>
-      <hr />
-        <table width="313" border="0">
-          <tr>
-	       <td width="66" height="31"><strong>SG<span class="sup">*</span> :</strong></td>
-	       <td width="237"><input name="sg" type="text" id="sg" value="1.000" />
-            <strong><?=$settings['mUnit']?></strong></td>
-          </tr>
-	     <tr>
-	       <td><strong>Amount:</strong></td>
-	       <td><input name="totalAmount" type="text" id="totalAmount" value="100" />
-            <strong><?=$settings['mUnit']?></strong></td>
-          </tr>
-        </table>
-	    <p>&nbsp;</p>
-	    <p>*<a href="https://www.perfumersvault.com/knowledge-base/3-specific-gravity-sg/" target="_blank">Specific Gravity of Ethanol</a></p>
-	    <div class="modal-footer">
-	     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-  		 <input type="submit" name="button" class="btn btn-primary" id="amountToMake" value="Scale Formula">
-	   </div>
-    </div>
-  </div>
- </div>
-</div>
-
-<!--Create accord-->
-<div class="modal fade" id="create_accord" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="create_accord" aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">Create accord</h5>
-      </div>
-      <div class="modal-body">
-      <div id="accordMsg"></div>
-        <table width="313" border="0">
-          <tr>
-	       <td width="106" height="31"><strong>Accord from:</strong></td>
-	       <td width="197"><label>
-	         <select name="accordProfile" id="accordProfile" class="form-control">
-	           <option value="Top">Top notes</option>
-	           <option value="Heart">Heart Notes</option>
-	           <option value="Base">Base Notes</option>
-	           </select>
-	         </label></td>
-          </tr>
-	     <tr>
-	       <td><strong>Name:</strong></td>
-	       <td><input name="accordName" type="text" class="form-control" id="accordName" value="<?=$f_name?> accord" /></td>
-          </tr>
-        </table>
-	    <hr />
-	    <div class="alert alert-info">This will create a new formula from the notes you choose. <br/>The current formula will stay intact.</div>
-	    <div class="modal-footer">
-	     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-  		 <input type="submit" name="button" class="btn btn-primary" id="createAccord" value="Create">
-	   </div>
-    </div>
-  </div>
- </div>
-</div>
-
-<!--Convert to ingredient-->
-<div class="modal fade" id="conv_ingredient" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="conv_ingredient" aria-hidden="true">
-  <div class="modal-dialog" role="document">
-    <div class="modal-content">
-      <div class="modal-header">
-        <h5 class="modal-title">Create ingredient from formula</h5>
-      </div>
-      <div class="modal-body">
-      <div id="cnvMsg"></div>
-        <table width="313" border="0">
-	     <tr>
-	       <td><strong>Name:</strong></td>
-	       <td><input name="ingName" type="text" class="form-control" id="ingName" value="<?=$f_name?>" /></td>
-          </tr>
-        </table>
-        <hr />
-        <div class="alert alert-info">The original formula will not be affected.</div>
-	    <div class="modal-footer">
-	     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
-  		 <input type="submit" name="button" class="btn btn-primary" id="conv2ing" value="Create">
-	   </div>
-    </div>
-  </div>
- </div>
-</div>
 
 
-<script>
-
 function extrasShow() {
 	$('[rel=tip]').tooltip({
          html: true,
@@ -673,7 +560,7 @@ function extrasShow() {
 $('#formula').editable({
   container: 'body',
   selector: 'a.concentration',
-  url: "/pages/update_data.php?formula=<?=$meta['fid']?>",
+  url: "/pages/update_data.php?formula=" + myFID,
   title: 'Purity %',
   type: "POST",
   dataType: 'json',
@@ -695,28 +582,29 @@ function extrasShow() {
 });
 <?php if($settings['editor'] == '1'){?>
 $('#formula').editable({
-  container: 'body',
-  selector: 'a.quantity',
-  url: "/pages/update_data.php?formula=<?=$meta['fid']?>",
-  title: 'Quantity in <?=$settings['mUnit']?>',
-  type: "POST",
-  dataType: 'json',
-	  success: function(response, newValue) {
-		if(response.status == 'error'){
-			return response.msg; 
-		}else{ 
-			reload_formula_data();
-		}
-	},
-  validate: function(value){
-   if($.trim(value) == ''){
-	return 'This field is required';
-   }
-   if($.isNumeric(value) == '' ){
-	return 'Numbers only!';
-   }
-  }
+	container: 'body',
+  	selector: 'a.quantity',
+  	url: "/pages/update_data.php?formula=" + myFID,
+  	title: 'Quantity in <?=$settings['mUnit']?>',
+  	type: "POST",
+  	dataType: 'json',
+		success: function(response, newValue) {
+			if(response.status == 'error'){
+				return response.msg; 
+			}else{ 
+				reload_formula_data();
+			}
+		},
+	validate: function(value){
+   		if($.trim(value) == ''){
+			return 'This field is required';
+   		}
+   		if($.isNumeric(value) == '' ){
+			return 'Numbers only!';
+   		}
+  	}
 });
+
 <?php } ?>
 $('#formula').editable({
 	container: 'body',
@@ -724,16 +612,16 @@ function extrasShow() {
 	type: 'POST',
 	emptytext: "",
 	emptyclass: "",
-	url: "/pages/update_data.php?formula=<?=$meta['fid']?>",
+	url: "/pages/update_data.php?formula=" + myFID,
 	title: 'Choose solvent',
 	source: [
-			 <?php
-				$res_ing = mysqli_query($conn, "SELECT id, name FROM ingredients WHERE type = 'Solvent' OR type = 'Carrier' ORDER BY name ASC");
-				while ($r_ing = mysqli_fetch_array($res_ing)){
-				echo '{value: "'.$r_ing['name'].'", text: "'.$r_ing['name'].'"},';
-			}
-			?>
-		  ],
+		<?php
+			$res_ing = mysqli_query($conn, "SELECT id, name FROM ingredients WHERE type = 'Solvent' OR type = 'Carrier' ORDER BY name ASC");
+			while ($r_ing = mysqli_fetch_array($res_ing)){
+			echo '{value: "'.$r_ing['name'].'", text: "'.$r_ing['name'].'"},';
+		}
+		?>
+	],
 	dataType: 'json',
 	success: function(response, newValue) {
 		if(response.status == 'error'){
@@ -748,7 +636,7 @@ function extrasShow() {
 $('#formula').editable({
   container: 'body',
   selector: 'i.notes',
-  url: "/pages/update_data.php?formula=<?=$fid?>",
+  url: "/pages/update_data.php?formula=" + myFID,
   title: 'Notes',
   type: "POST",
   dataType: 'json',
@@ -802,7 +690,7 @@ function ingCAS(data, type, row, meta){
 	if(type === 'display'){
 		data = '<i class="pv_point_gen" rel="tip" title="Click to copy" id="cCAS" data-name="'+row.ingredient.cas+'">'+row.ingredient.cas+'</i>';
 	}
-  return data;
+	return data;
 }
   
 function ingConc(data, type, row, meta){
@@ -833,7 +721,7 @@ function ingSolvent(data, type, row, meta){
 			data = 'None';
 		}
 	}
-  return data;
+ 	return data;
 }
   
 function ingQuantity(data, type, row, meta){
@@ -890,22 +778,22 @@ function ingInv(data, type, row, meta){
 function ingActions(data, type, row, meta){
 
 	data = '<div class="dropdown">' +
-        '<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+        '<button type="button" class="btn" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
             '<ul class="dropdown-menu dropdown-menu-end">';
 
-	data += '<li><a class="dropdown-item link-dark" href="'+ row.ingredient.pref_supplier_link +'" target="_blank" rel="tip" title="Open '+ row.ingredient.pref_supplier +' page"><i class="fas fa-shopping-cart mx-2"></i>Go to supplier</a></li>';
+	data += '<li><a class="dropdown-item" href="'+ row.ingredient.pref_supplier_link +'" target="_blank" rel="tip" title="Open '+ row.ingredient.pref_supplier +' page"><i class="fas fa-shopping-cart mx-2"></i>Go to supplier</a></li>';
 	
 	<?php if($meta['isProtected'] == FALSE){?>
 	if(row.exclude_from_calculation == 0){
-	 	var ex = '<li><i class="dropdown-item pv_point_gen link-dark" rel="tip" id="exIng" title="Exclude '+ row.ingredient.name +'" data-name="'+ row.ingredient.name +'" data-status="1" data-id="'+ row.formula_ingredient_id +'"><i class="pv_point_gen fas fa-eye-slash mx-2"></i>Exlude</i></li>';
+	 	var ex = '<li><i class="dropdown-item pv_point_gen" rel="tip" id="exIng" title="Exclude '+ row.ingredient.name +'" data-name="'+ row.ingredient.name +'" data-status="1" data-id="'+ row.formula_ingredient_id +'"><i class="pv_point_gen fas fa-eye-slash mx-2"></i>Exlude</i></li>';
 		
 	}else if(row.exclude_from_calculation == 1){
-	 	var ex = '<li><i class="dropdown-item pv_point_gen link-dark" rel="tip" id="exIng" title="Include '+ row.ingredient.name +'" data-name="'+ row.ingredient.name +'" data-status="0" data-id="'+ row.formula_ingredient_id +'"><i class="pv_point_gen fas fa-eye mx-2"></i>Include</i></li>';
+	 	var ex = '<li><i class="dropdown-item pv_point_gen" rel="tip" id="exIng" title="Include '+ row.ingredient.name +'" data-name="'+ row.ingredient.name +'" data-status="0" data-id="'+ row.formula_ingredient_id +'"><i class="pv_point_gen fas fa-eye mx-2"></i>Include</i></li>';
 	}
 	
-	data += ex + '<li><i data-bs-toggle="modal" data-bs-target="#replaceIng" class="dropdown-item pv_point_gen open-replace-dialog text-info" rel="tip" title="Replace '+ row.ingredient.name +'"  data-name="'+ row.ingredient.name +'" data-id="'+ row.formula_ingredient_id +'" data-cas="'+row.ingredient.cas+'" data-desc="'+row.ingredient.desc+'"><i class="pv_pont_gen fas fa-exchange-alt text-info mx-2"></i>Replace ingredient</i></li>'
+	data += ex + '<li><i data-bs-toggle="modal" data-bs-target="#replaceIng" class="dropdown-item pv_point_gen open-replace-dialog text-info-emphasis" rel="tip" title="Replace '+ row.ingredient.name +'"  data-name="'+ row.ingredient.name +'" data-id="'+ row.formula_ingredient_id +'" data-cas="'+row.ingredient.cas+'" data-desc="'+row.ingredient.desc+'"><i class="pv_pont_gen fas fa-exchange-alt text-info-emphasis mx-2"></i>Replace ingredient</i></li>'
 	
-	+ '<li><i data-bs-toggle="modal" data-bs-target="#mrgIng" rel="tip" title="Merge '+ row.ingredient.name +'" class="dropdown-item pv_point_gen open-merge-dialog text-warning" data-name="'+ row.ingredient.name +'" data-id="'+ row.formula_ingredient_id +'"><i class="pv_point_gen fas fa-object-group alert-warning mx-2"></i>Merge ingredients</i></li>'
+	+ '<li><i data-bs-toggle="modal" data-bs-target="#mrgIng" rel="tip" title="Merge '+ row.ingredient.name +'" class="dropdown-item pv_point_gen open-merge-dialog text-warning-emphasis" data-name="'+ row.ingredient.name +'" data-id="'+ row.formula_ingredient_id +'"><i class="pv_point_gen fas fa-object-group alert-warning mx-2"></i>Merge ingredients</i></li>'
 	
 	+'<div class="dropdown-divider"></div>'
 	+ '<li><i rel="tip" title="Remove '+ row.ingredient.name +'" class="dropdown-item text-danger pv_point_gen" id="rmIng" data-name="'+ row.ingredient.name +'" data-id="'+ row.formula_ingredient_id +'" data-ingredient-id="'+row.ingredient.id+'"><i class="pv_point_gen fas fa-trash mx-2 text-danger"></i>Delete</i></li>';
@@ -917,10 +805,125 @@ function ingActions(data, type, row, meta){
 
 </script>
 <script src="/js/fullformula.view.js"></script>
-
 <script src="/js/mark/jquery.mark.min.js"></script>
 <script src="/js/mark/datatables.mark.js"></script>
 
+<!--Schedule Formula-->
+<div class="modal fade" id="schedule_to_make" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="schedule_to_make" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Schedule formula to make</h5>
+      </div>
+      <div class="modal-body">
+      <div id="scheduleToMakeMsg"></div>
+      <div class="alert alert-info">This will add the current formulation to scheduled formulas. Any changes in this formula will not be replicated to the scheduled version. If you make changes here, you have to remove it and re-add it for making.</div>
+	    <div class="modal-footer">
+	     <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+  		 <input type="submit" name="button" class="btn btn-primary" id="addTODO" value="Schedule Formula">
+	   </div>
+    </div>
+  </div>
+ </div>
+</div>
+
+<!--Scale Formula-->
+<div class="modal fade" id="amount_to_make" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="amount_to_make" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Scale formula</h5>
+      </div>
+      <div class="modal-body">
+        <div id="amountToMakeMsg"></div>
+        <p>This will re-calculate the ingredients quantity as per the new total.</p>
+        <hr />
+        <div class="mb-3">
+          <label for="sg" class="form-label"><strong>SG<span class="sup">*</span></strong></label>
+          <div class="input-group">
+            <input name="sg" type="text" class="form-control" id="sg" value="1.000" />
+            <span class="input-group-text"><strong><?=$settings['mUnit']?></strong></span>
+          </div>
+        </div>
+        <div class="mb-3">
+          <label for="totalAmount" class="form-label"><strong>New amount</strong></label>
+          <div class="input-group">
+            <input name="totalAmount" type="text" class="form-control" id="totalAmount" value="100" />
+            <span class="input-group-text"><strong><?=$settings['mUnit']?></strong></span>
+          </div>
+        </div>
+        <hr />
+        <p>*<a href="https://www.perfumersvault.com/knowledge-base/3-specific-gravity-sg/" target="_blank">Specific Gravity of Ethanol</a></p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+        <input type="submit" name="button" class="btn btn-primary" id="amountToMake" value="Scale Formula">
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<!--Create accord-->
+<div class="modal fade" id="create_accord" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="create_accord" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Create accord</h5>
+      </div>
+      <div class="modal-body">
+        <div id="accordMsg"></div>
+        <div class="mb-3">
+          <label for="accordProfile" class="form-label"><strong>Accord from</strong></label>
+          <select name="accordProfile" id="accordProfile" class="form-control">
+            <option value="Top">Top notes</option>
+            <option value="Heart">Heart Notes</option>
+            <option value="Base">Base Notes</option>
+          </select>
+        </div>
+        <div class="mb-3">
+          <label for="accordName" class="form-label"><strong>Name</strong></label>
+          <input name="accordName" type="text" class="form-control" id="accordName" value="<?=$f_name?> accord" />
+        </div>
+        <hr />
+        <div class="alert alert-info"><i class="fa-solid fa-circle-exclamation mr-2"></i>This will create a new formula from the notes you choose. <br/>The current formula will stay intact.</div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+        <input type="submit" name="button" class="btn btn-primary" id="createAccord" value="Create">
+      </div>
+    </div>
+  </div>
+</div>
+
+
+<!--Convert to ingredient-->
+<div class="modal fade" id="conv_ingredient" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="conv_ingredient" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Create ingredient from formula</h5>
+      </div>
+      <div class="modal-body">
+        <div id="cnvMsg"></div>
+        <div class="mb-3">
+          <label for="ingName" class="form-label"><strong>Name</strong></label>
+          <input name="ingName" type="text" class="form-control" id="ingName" value="<?=$f_name?>" />
+        </div>
+        <hr />
+        <div class="alert alert-info">
+          <i class="fa-solid fa-circle-exclamation mr-2"></i>The original formula will not be affected.
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+        <input type="submit" name="button" class="btn btn-primary" id="conv2ing" value="Create">
+      </div>
+    </div>
+  </div>
+</div>
+
+
 <div class="modal fade" id="manage-quantity" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="manage-quantity" aria-hidden="true">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
diff --git a/pages/viewPyramid.php b/pages/viewPyramid.php
index fcf4abf9..043d3d86 100755
--- a/pages/viewPyramid.php
+++ b/pages/viewPyramid.php
@@ -15,7 +15,7 @@
 $formula = mysqli_real_escape_string($conn, $_GET['formula']);
 $fid = mysqli_real_escape_string($conn, $_GET['fid']);
 if(empty(mysqli_num_rows(mysqli_query($conn, "SELECT id FROM formulas WHERE fid = '$fid'")))){
-	echo '<div class="alert alert-info alert-dismissible">Incomplete formula.</div>';
+	echo '<div class="alert alert-info">Incomplete formula.</div>';
 	return;
 }
 ?>
@@ -29,12 +29,12 @@
   font-size: 11px;
 }						
 </style>
-<script src="../js/amcharts_3.21.15.free/amcharts/amcharts.js"></script>
-<script src="../js/amcharts_3.21.15.free/amcharts/funnel.js"></script>
-<script src="../js/amcharts_3.21.15.free/amcharts/themes/light.js"></script>
+<script src="/js/amcharts_3.21.15.free/amcharts/amcharts.js"></script>
+<script src="/js/amcharts_3.21.15.free/amcharts/funnel.js"></script>
+<script src="/js/amcharts_3.21.15.free/amcharts/themes/light.js"></script>
 
-<script src="../js/amcharts_3.21.15.free/amcharts/plugins/export/export.min.js"></script>
-<link rel="stylesheet" href="../js/amcharts_3.21.15.free/amcharts/plugins/export/export.css" type="text/css" media="all" />  
+<script src="/js/amcharts_3.21.15.free/amcharts/plugins/export/export.min.js"></script>
+<link rel="stylesheet" href="/js/amcharts_3.21.15.free/amcharts/plugins/export/export.css" type="text/css" media="all" />  
 <script>
 var chart = AmCharts.makeChart( "chartdiv", {
   "type": "funnel",
@@ -73,7 +73,8 @@
   "export": {
     "enabled": true
   }
-} );
+  
+});
 </script>
 
 <div id="wrapper">
diff --git a/pages/views/IFRA/genIFRAdoc.php b/pages/views/IFRA/genIFRAdoc.php
index b44b0822..73e49e50 100644
--- a/pages/views/IFRA/genIFRAdoc.php
+++ b/pages/views/IFRA/genIFRAdoc.php
@@ -47,8 +47,8 @@
 
 $new_conc = $bottle/100*$type;
 
-if(validateFormula($fid, $bottle, $new_conc, $mg['total_mg'], $defCatClass, $settings['qStep'], $conn) == TRUE){
-	echo '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>Your formula contains materials, exceeding and/or missing IFRA standards. Please alter your formula and try again</div>';
+if(validateFormula($fid, $bottle, $new_conc, $mg['total_mg'], $defCatClass, $settings['qStep']) !== 0){
+	echo '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>Your formula contains materials not compatible with IFRA standards</div>';
 	return;
 }
 
diff --git a/pages/views/formula/analysis.php b/pages/views/formula/analysis.php
index b0c5b682..11a1a716 100644
--- a/pages/views/formula/analysis.php
+++ b/pages/views/formula/analysis.php
@@ -13,7 +13,7 @@
 <h3>Composition analysis</h3>
 <hr>
 
-<table id="tdAnalysis" class="table table-striped table-bordered" style="width:100%">
+<table id="tdAnalysis" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Main Ingredient</th>
diff --git a/pages/views/formula/attachments.php b/pages/views/formula/attachments.php
index 0311fd18..b259533b 100644
--- a/pages/views/formula/attachments.php
+++ b/pages/views/formula/attachments.php
@@ -21,7 +21,7 @@
       </div>                    
     </div>
 </div>
-<table id="tdAttachments" class="table table-striped table-bordered" style="width:100%">
+<table id="tdAttachments" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Name</th>
diff --git a/pages/views/formula/batches.php b/pages/views/formula/batches.php
index fef14cdc..da25872d 100644
--- a/pages/views/formula/batches.php
+++ b/pages/views/formula/batches.php
@@ -12,7 +12,7 @@
     </div>
     <div class="card-body">
       <div class="table-responsive">
-        <table class="table table-bordered" id="tdDataBatches" width="100%" cellspacing="0">
+        <table class="table table-striped" id="tdDataBatches" width="100%" cellspacing="0">
           <thead>
             <tr>
               <th>Batch ID</th>
diff --git a/pages/views/formula/cmp_formulas_data.php b/pages/views/formula/cmp_formulas_data.php
index e38556e4..5bb2a44a 100644
--- a/pages/views/formula/cmp_formulas_data.php
+++ b/pages/views/formula/cmp_formulas_data.php
@@ -84,7 +84,7 @@
 </script>
 <div class="compare">
     <div class="cmp_a">
-        <table id="formula_a_table" class="table table-striped table-bordered nowrap" style="width:100%">
+        <table id="formula_a_table" class="table table-striped nowrap" style="width:100%">
             <thead>
                 <tr>
                     <th>Ingredient</th>
@@ -95,7 +95,7 @@
         </table>
     </div>
         <div class="cmp_a">
-        <table id="formula_b_table" class="table table-striped table-bordered nowrap" style="width:100%">
+        <table id="formula_b_table" class="table table-striped nowrap" style="width:100%">
             <thead>
                 <tr>
                     <th>Ingredient</th>
diff --git a/pages/views/formula/finishedProduct.php b/pages/views/formula/finishedProduct.php
new file mode 100644
index 00000000..fa52cf31
--- /dev/null
+++ b/pages/views/formula/finishedProduct.php
@@ -0,0 +1,451 @@
+<?php 
+define('__ROOT__', dirname(dirname(dirname(dirname(__FILE__))))); 
+require_once(__ROOT__.'/inc/sec.php');
+require_once(__ROOT__.'/inc/opendb.php');
+
+
+?>
+
+<div id="content-wrapper" class="d-flex flex-column">
+	<div class="container-fluid">
+    	<div class="card shadow mb-4">
+        	<div class="card-header py-3"> 
+              <h2 class="m-0 font-weight-bold">Generate Finished Product</a>
+            </div>
+              <div class="mt-4 mr-4 text-right">
+              	<div class="btn-group">
+                  <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
+                  <div class="dropdown-menu dropdown-menu-left">
+           			<li><a href="#" class="dropdown-item" id="export_pdf"><i class="fa-solid fa-file-export mx-2"></i>Export to PDF</a></li>
+                    <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#IFRA"><i class="fa-solid fa-certificate mx-2"></i>IFRA Document</a></li>
+                    <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#ViewBoxLabel"><i class="fa-solid fa-font mx-2"></i>View Box Back Label</a></li>
+                  </div>
+                </div>
+            </div>
+            <div class="card-body">
+           		<div id="compliance"></div>
+                <table id="formula" class="table table-striped nowrap" style="width:100%">
+                    <thead class="table-primary">
+                        <tr>
+                            <th>Ingredient</th>
+                            <th>CAS</th>
+                            <th>Quantity</th>
+                            <th>Concentration %</th>
+                            <th>Cost</th>
+                        </tr>
+                    </thead>
+                    <tfoot>
+                        <tr>
+                            <th colspan="5">&nbsp;</th>
+                        </tr>
+                        <tr>
+                            <th></th>
+                            <th class="fw-medium text-info-emphasis text-right">Sub Total</th>
+                            <th class="fw-medium text-info-emphasis text-center" id="sub-total-quantity"></th>
+                            <th class="fw-medium text-info-emphasis text-center" id="sub-total-concentration"></th>
+                            <th class="fw-medium text-info-emphasis text-center" id="sub-total-cost"></th>
+                        </tr>
+                        <tr>
+                            <th></th>
+                            <th class="fw-medium text-info-emphasis text-right">Carrier/Solvent</th>
+                            <th class="fw-medium text-info-emphasis text-center" id="carrier-quantity"></th>
+                            <th class="fw-medium text-info-emphasis text-center" id="carrier-concentration"></th>
+                            <th class="fw-medium text-info-emphasis text-center" id="carrier-cost"></th>
+                        </tr>
+                        <tr>
+                            <th></th>
+                            <th class="fw-medium text-info-emphasis text-right">Bottle</th>
+                            <th class="fw-medium text-info-emphasis text-center" id="bottle-quantity"></th>
+                            <th class="fw-medium text-info-emphasis text-center">-</th>
+                            <th class="fw-medium text-info-emphasis text-center" id="bottle-cost"></th>
+                        </tr>
+                        <tr>
+                            <th></th>
+                            <th class="fw-medium text-info-emphasis text-right">Lid</th>
+                            <th class="fw-medium text-info-emphasis text-center" id="lid-style"></th>
+                            <th class="fw-medium text-info-emphasis text-center">-</th>
+                            <th class="fw-medium text-info-emphasis text-center" id="lid-cost"></th>
+                        </tr>
+                        <tr>
+                            <th></th>
+                            <th class="fw-medium text-info-emphasis text-right">Batch No</th>
+                            <th class="fw-medium text-info-emphasis text-center" id="batch-no"></th>
+                            <th class="fw-medium text-info-emphasis text-center">-</th>
+                            <th class="fw-medium text-info-emphasis text-center">-</th>
+                        </tr>
+                        <tr>
+                            <th></th>
+                            <th class="fw-bold text-info-emphasis text-right">Total</th>
+                            <th class="fw-bold text-info-emphasis text-center" id="total-quantity"></th>
+                            <th class="fw-bold text-info-emphasis text-center" id="total-concentration"></th>
+                            <th class="fw-bold text-info-emphasis text-center" id="total-cost"></th>
+                        </tr>
+                   </tfoot>
+                </table>
+
+          		<div class="mt-4 mb-4 dropdown-divider"></div>
+           		<p>*Values in: <strong class="alert alert-danger mx-2">red</strong> exceeds usage level, <strong class="alert bg-banned mx-2">dark red</strong> banned/prohibited, <strong class="alert alert-warning mx-2">yellow</strong> Specification,<strong class="alert alert-success mx-2">green</strong> are within usage level,<strong class="alert alert-info mx-2">blue</strong> are exceeding recommended usage level</p>
+                
+			</div>
+		</div>
+	</div>
+</div>
+
+<!--VIEW BOX LABEL MODAL-->            
+<div class="modal fade" id="ViewBoxLabel" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="ViewBoxLabel" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title mgmIngHeader mgmIngHeader-with-separator" id="headerLabel">View Label</h5>
+        <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body modal-Label-body-data">
+        <div class="alert alert-info"><i class="fa-solid fa-circle-info mx-2"></i>Loading...</div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+      	<button type="button" class="btn btn-primary" id="printLabel" data-print-target=".modal-Label-body-data">Print<i class="fa-solid fa-arrow-up-right-from-square ml-2"></i></button>
+	  </div>
+    </div>
+  </div>
+</div>
+
+
+<!-- Modal IFRA DOC-->
+<div class="modal fade" id="IFRA" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="IFRA" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">Generate IFRA Document</h5>
+      </div>
+      <div class="modal-body">
+      <div class="alert alert-info"><i class="fa-solid fa-circle-exclamation mr-2"></i>IMPORTANT: The generated document isn't an official IFRA certificate and needs to be reviewed by a certified person. Also, data needs to be properly verified to make sure there are no errors.</div>
+
+	  <div class="mb-3">
+  		<label for="customer" class="form-label">Select customer</label>
+        <select class="form-control" name="customer" id="customer">
+            <?php
+				$res = mysqli_query($conn, "SELECT id, name FROM customers ORDER BY name ASC");
+				while ($q = mysqli_fetch_array($res)){
+				echo '<option value="'.$q['id'].'">'.$q['name'].'</option>';
+			}
+			?>
+        </select>
+       </div>
+	   <div class="mb-3">
+  			<label for="template" class="form-label">Select IFRA document template</label>
+            <select class="form-control" name="template" id="template">
+            <?php
+				$res = mysqli_query($conn, "SELECT id, name FROM templates ORDER BY name ASC");
+				while ($q = mysqli_fetch_array($res)){
+				echo '<option value="'.$q['id'].'">'.$q['name'].'</option>';
+			}
+			?>
+            </select>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+        <input type="submit" class="btn btn-primary" id="generateDoc" value="Generate">
+      </div>
+    </div>
+  </div>
+</div>
+           
+      
+  <!-- Modal IFRA Doc -->
+  <div class="modal fade" id="ifraDocModal" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="ifraDocModalLabel" aria-hidden="true">
+  <div class="modal-dialog odal-dialog-scrollable modal-fullscreen" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="ifraDocModalLabel">IFRA Document</h5>
+        <button type="button" class="close" data-bs-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body modal-IFRA-body-data">
+        Loading...
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-primary" id="printIFRADoc" data-print-target=".modal-IFRA-body-data">Print<i class="fa-solid fa-arrow-up-right-from-square ml-2"></i></button>
+      </div>
+    </div>
+  </div>
+</div>
+<script>
+var id = "<?=$_POST['fid']?>";
+var bottle_id = "<?=$_POST['bottle_id']?>";
+var carrier_id = "<?=$_POST['carrier_id']?>";
+var lid_id = "<?=$_POST['lid_id']?>";
+var concentration = "<?=$_POST['concentration']?>";
+var defCatClass = "<?=$_POST['defCatClass']?>";
+var supplier_id = "<?=$_POST['supplier_id']?>";
+var batch_id = "<?=$_POST['batch_id']?>";
+var formula_name;
+var product_name;
+var carrier_concentration ;
+var batchNo;
+var fid;
+
+$(document).ready(function() {
+						   
+  var formula_table = $('#formula').DataTable( {
+		columnDefs: [
+			{ className: 'text-center', targets: '_all' },
+			{ orderable: false, targets: '_all' },
+        ],
+		processing: true,
+		responsive: false,
+		searching: false,
+		paging: false,
+        language: {
+			loadingRecords: '&nbsp;',
+			processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw"></i><span class="sr-only">Blending...</span>',
+			emptyTable: '<div class="alert alert-warning"><strong>Empty formula</strong></div>',
+		},
+		//dom: 'B',
+		buttons: [
+			{
+				extend: 'pdfHtml5',
+				customize: function (doc) {
+					doc.pageMargins = [50,20,50,20];
+					doc.content[1].table.widths = ['*', '*', '*', '*', '*' ];
+					
+					doc.styles.tableHeader.fontSize = 9;
+					doc.styles.tableFooter.fontSize = 9;
+					var footerData = [];
+					$('#formula tfoot tr').each(function () {
+						var rowData = [];
+						$(this).find('th').each(function (index) {
+							var cellData = $(this).text() || ' ';
+							rowData.push({ text: cellData, style: 'tableFooter' });
+						});
+						while (rowData.length < 5) {
+							rowData.push({ text: ' ', style: 'tableFooter' });
+						}
+						footerData.push(rowData);
+					});
+	
+					footerData.forEach(function (row) {
+						doc.content[1].table.body.push(row.map(function (cell) {
+							return { text: cell, style: 'tableFooter' };
+						}));
+					});
+	
+					doc.styles.tableFooter = {
+						bold: true,
+						fontSize: 9,
+						alignment: 'center',
+						//color: 'blue',
+						margin: [0, 0, 0, 2],
+						border: [false, false, false, true],
+						borderColor: '#000000',
+						borderWidth: 1
+					};
+				}
+			}
+        ],
+    	ajax: {
+    		url: '/core/finished_formula_data.php',
+			type: 'POST',
+			data:{
+		   		id: id,
+				bottle_id: $("#bottle_id").val(),
+				carrier_id: $("#carrier_id").val(),
+				lid_id: $("#lid_id").val(),
+				concentration: $("#concentration").val(),
+				defCatClass: $("#defCatClass").val(),
+				supplier_id: $("#supplier_id").val(),
+				batch_id: $("#batch_id").val()
+			 }
+ 		 },
+		 columns: [
+			   { data : 'ingredient.name', title: 'Ingredient'},
+			   { data : 'ingredient.cas', title: 'CAS #'},
+			   { data : 'quantity', title: 'Quantity'},
+			   { data : 'final_concentration', title: 'Concentration'},
+			   { data : 'cost', title: 'Cost'}				   
+		],
+  		footerCallback : function( tfoot, data, start, end, display ) {    
+      
+			  var response = this.api().ajax.json();
+			  if(response){
+				formula_name = response.meta['formula_name'];
+				product_name = response.meta['product_name'];
+				carrier_concentration = response.meta['carrier_concentration'];
+				batchNo = response.meta['batchNo'];
+				fid = response.meta['fid'];
+			
+				$('#sub-total-quantity').text(response.meta['sub_total_quantity'] + response.meta['quantity_unit']);
+				$('#carrier-quantity').text(response.meta['carrier_quantity'] + response.meta['quantity_unit']);
+				$('#bottle-quantity').text(response.meta['bottle_quantity'] + response.meta['quantity_unit']);
+				$('#lid-cost').html(response.meta['currency'] + response.meta['lid_cost']);
+				$('#lid-style').text(response.meta['lid_style']);
+				
+				if(response.meta['batchNo']){
+					$('#batch-no').html('<a href="/pages/viewDoc.php?type=batch&id=' + response.meta['batchNo'] + '" target="_blank">' + response.meta['batchNo'] + '</a>');
+				} else {
+					$('#batch-no').text('Not generated');
+				}
+				
+				$('#total-quantity').text(response.meta['total_quantity'] + response.meta['quantity_unit']);
+				$('#sub-total-concentration').text(response.meta['sub_concentration'] + '%');
+				$('#carrier-concentration').text(response.meta['carrier_concentration'] + '%');
+				$('#carrier-cost').html(response.meta['currency'] + response.meta['carrier_cost']);
+				$('#sub-total-cost').html(response.meta['currency'] + response.meta['sub_cost']);
+				$('#bottle-cost').html(response.meta['currency'] + response.meta['bottle_cost']);
+				$('#total-cost').html(response.meta['currency'] + response.meta['total_cost']);
+		
+				createAlertBox(response);
+		
+			 }
+      },
+      
+      createdRow: function(row, data, dataIndex) {
+		  const setAlertClassAndIcon = (selector, alertClass, title) => {
+			$(row).find(selector).addClass(alertClass).append(`<i rel="tip" title="${title}" class="mx-2 pv_point_gen fas fa-info-circle"></i>`);
+		  };
+		
+		  const checkUsage = (selector, regulator, limit, concentration, restriction) => {
+			if (regulator === "IFRA" && parseFloat(limit) < parseFloat(concentration)) {
+			  setAlertClassAndIcon(selector, 'alert-danger', `Max usage: ${limit}% IFRA Regulated`);
+			} else if (regulator === "PV" && parseFloat(limit) < parseFloat(concentration)) {
+			  switch (restriction) {
+				case 1:
+				  setAlertClassAndIcon(selector, 'alert-info', `Recommended usage: ${limit}%`);
+				  break;
+				case 2:
+				  setAlertClassAndIcon(selector, 'alert-danger', `Restricted usage: ${limit}%`);
+				  break;
+				case 3:
+				  setAlertClassAndIcon(selector, 'alert-warning', `Specification: ${limit}%`);
+				  break;
+				default:
+				  setAlertClassAndIcon(selector, 'alert-success', '');
+			  }
+			} else {
+			  $(row).find(selector).addClass('alert-success');
+			}
+		  };
+		
+		  // Check initial usage
+		  checkUsage('td:eq(3)', data['usage_regulator'], data['usage_limit'], data['concentration'], data['usage_restriction']);
+		
+		  // Check ingredient classification
+		  if (data.ingredient.classification == 4) {
+			$(row).find('td').not('td:eq(5)').addClass('bg-banned text-light').append('<i rel="tip" title="This material is prohibited" class="mx-2 pv_point_gen fas fa-ban"></i>');
+		  }
+		
+		  // Check final usage
+		  checkUsage('td:eq(3)', data['usage_regulator'], data['usage_limit'], data['final_concentration'], data['usage_restriction']);
+		},
+
+	  	drawCallback: function ( settings ) {
+			extrasShow();
+	   }
+});
+
+	
+	function extrasShow() {
+		$('[rel=tip]').tooltip({
+			 html: true,
+			 boundary: "window",
+			 overflow: "auto",
+			 container: "body",
+			 delay: {"show": 100, "hide": 0},
+		 });
+	};
+
+	function createAlertBox(response) {
+	  var alertBox = '<div class="alert alert-' + response.compliance.slug + '">' +
+					 '<i class="fa-solid fa-circle-exclamation mx-2"></i><strong>' + 
+					 response.compliance.message + '</strong>';
+	
+	  if (response.compliance.inval_materials.data && response.compliance.inval_materials.data.length > 0) {
+		alertBox += '<br><a data-bs-toggle="collapse" href="#invalidMaterials" role="button" aria-expanded="false" aria-controls="invalidMaterials">' +
+					'Show details</a>' +
+					'<div class="collapse" id="invalidMaterials">' +
+					'<ul>';
+	
+		response.compliance.inval_materials.data.forEach(function(material) {
+		  alertBox += '<li>' + material + '</li>';
+		});
+	
+		alertBox += '</ul></div>';
+	  }
+	
+	  alertBox += '</div>';
+	
+	  $('#compliance').html(alertBox);
+	};
+
+
+	$("#ViewBoxLabel").on("show.bs.modal", function(e) {
+		
+	  const action = "viewBoxLabel"; 
+	
+	  const url = "/pages/manageFormula.php?action="+ action + "&batchID=" + batchNo +"&fid=" + fid + "&carrier=" + carrier_concentration +"&download=text";
+	
+	  $.get(url)
+		.then(data => {
+		  $("#headerLabel", this).html(formula_name);
+		  $(".modal-body", this).html(data);
+		});
+		
+	});
+
+	$('#generateDoc').click(function() {
+		$('.modal-IFRA-body-data').html('loading');
+		$.ajax({
+		   type: 'POST',
+		   url: '/pages/views/IFRA/genIFRAdoc.php',
+		   data:{
+			   fid: fid,
+			   conc: concentration,
+			   bottle: bottle_id,
+			   defCatClass: defCatClass,
+			   template: $("#template").val(),
+			   customer: $("#customer").val()
+		   },
+		   success: function(data) {
+				$('.modal-IFRA-body-data').html(data);
+				$('#ifraDocModal').modal('show'); 
+		   },
+		   error:function(err){
+				data = '<div class="alert alert-danger">Unable to generate data</div>';
+				$('.modal-IFRA-body-data').html(data);
+				$('#ifraDocModal').modal('show'); 
+		   }
+		})
+	 });
+		 
+		 
+	function printContent(contentClass) {
+		var printContents = $(contentClass).html();
+		var printWindow = window.open('', '_blank', 'width=800,height=600');
+		
+		printWindow.document.open();
+		printWindow.document.write('<html><head><title>Print</title>');
+		printWindow.document.write('</head><body>');
+		printWindow.document.write(printContents);
+		printWindow.document.write('</body></html>');
+		printWindow.document.close();
+	
+		printWindow.focus();
+		printWindow.print();
+		printWindow.close();
+	}
+	
+	$('#printLabel, #printIFRADoc').click(function() {
+		var contentClass = $(this).data('print-target');
+		printContent(contentClass);
+	});
+
+	$('#export_pdf').on('click',function(){
+		$('#formula').DataTable().button(0).trigger();
+	});
+
+});//doc ready
+</script>
diff --git a/pages/views/formula/pendingMaterials.php b/pages/views/formula/pendingMaterials.php
index 10e17418..e6e5fc1f 100644
--- a/pages/views/formula/pendingMaterials.php
+++ b/pages/views/formula/pendingMaterials.php
@@ -14,7 +14,7 @@
            <li><a class="dropdown-item" id="exportCSV" href="#"><i class="fa-solid fa-file-export mx-2"></i>Export to CSV</a></li>
        </div>
    	</div> 
-	<table id="tdDataM" class="table table-striped table-bordered nowrap" style="width:100%">
+	<table id="tdDataM" class="table table-striped" style="width:100%">
       <thead>
         <tr>
           <th>Formula</th>
diff --git a/pages/views/formula/replacements.php b/pages/views/formula/replacements.php
index 15df875c..785e7502 100644
--- a/pages/views/formula/replacements.php
+++ b/pages/views/formula/replacements.php
@@ -12,7 +12,7 @@
 <h3>Possible replacements</h3>
 <hr>
 
-<table id="tdReplacements" class="table table-striped table-bordered" style="width:100%">
+<table id="tdReplacements" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Main Ingredient</th>
@@ -22,54 +22,67 @@
 </table>
 
 
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function() {
 
-$('[data-bs-toggle="tooltip"]').tooltip();
-var tdReplacements = $('#tdReplacements').DataTable( {
-	columnDefs: [
-		{ className: 'text-center', targets: '_all' },
-	],
-	dom: 'lfrtip',
-	processing: true,
-	language: {
-		loadingRecords: '&nbsp;',
-		processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw"></i><span class="sr-only">Loading...</span>',
-		emptyTable: 'No replacements found.',
-		search: 'Search:'
+	var tdReplacements = $('#tdReplacements').DataTable( {
+		columnDefs: [
+			{ className: 'text-center', targets: '_all' },
+		],
+		dom: 'lfrtip',
+		processing: true,
+		language: {
+			loadingRecords: '&nbsp;',
+			processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw"></i><span class="sr-only">Loading...</span>',
+			emptyTable: 'No replacements found.',
+			search: 'Search:'
 		},
-	ajax: {	
-		url: '/core/list_ing_rep_data.php',
-		type: 'POST',
-		data: {
-				fid: '<?=$fid?>',
-				view: 'formula',
-			},
+		ajax: {	
+			url: '/core/list_ing_rep_data.php',
+			type: 'POST',
+			data: {
+					fid: '<?=$fid?>',
+					view: 'formula',
+				},
 		},
-	columns: [
-			  { data : 'ing_name', title: 'Main Ingredient', render: repName, name: 'main_ing' },
-			  { data : 'ing_rep_name', title: 'Possible Replacement', render: repIng }
-			 ],
-	rowsGroup: [
-      'main_ing:name'
-    ],
-	drawCallback: function ( settings ) {
+		columns: [
+			{ data : 'ing_name', title: 'Main Ingredient', render: repName, name: 'main_ing' },
+			{ data : 'ing_rep_name', title: 'Possible Replacement', render: repIng }
+		],
+		rowsGroup: [
+		  'main_ing:name'
+		],
+		drawCallback: function ( settings ) {
 			extrasShow();
-	},
-	order: [[ 0, 'asc' ]],
-	lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]],
-	pageLength: 20,
-	displayLength: 20
+		},
+			order: [[ 0, 'asc' ]],
+			lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]],
+			pageLength: 20,
+			displayLength: 20
 	});
-});
 
-function repName(data, type, row){
-	return '<i class="ing_name pv_point_gen" data-name="ing_name" data-type="text" data-pk="'+row.id+'">'+row.ing_name+'</i>';    
-}
 
-function repIng(data, type, row){
-	return '<a class="popup-link ing_rep_name pv_point_gen" href="/pages/mgmIngredient.php?id=' + btoa(row.ing_rep_name) + '">' + row.ing_rep_name + '</a> <i class="fas fa-info-circle pv_point_gen" title="'+row.notes+'"></i>';
-}
+	function repName(data, type, row){
+		return '<i class="ing_name pv_point_gen" data-name="ing_name" data-type="text" data-pk="'+row.id+'">'+row.ing_name+'</i>';    
+	};
+	
+	function repIng(data, type, row){
+		return '<a class="popup-link ing_rep_name pv_point_gen" href="/pages/mgmIngredient.php?id=' + btoa(row.ing_rep_name) + '">' + row.ing_rep_name + '</a> <i class="fas fa-info-circle pv_point_gen" rel="tip" title="'+row.notes+'"></i>';
+	};
+	
+	function extrasShow() {
+		$('[rel=tip]').tooltip({
+			"html": true,
+			"delay": {"show": 100, "hide": 0},
+		});
+		$('.popup-link').magnificPopup({
+			type: 'iframe',
+			closeOnContentClick: false,
+			closeOnBgClick: false,
+			showCloseBtn: true,
+		});
+	};
 
+});
 
 </script>
diff --git a/pages/views/formula/revisions.php b/pages/views/formula/revisions.php
index 0f65b38b..74172e88 100644
--- a/pages/views/formula/revisions.php
+++ b/pages/views/formula/revisions.php
@@ -5,7 +5,7 @@
     <div class="text-right">
       <div class="btn-group">
         <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
-            <div class="dropdown-menu dropdown-menu-right">
+            <div class="dropdown-menu">
                 <li><a class="dropdown-item" href="#" id="genRev"><i class="fa-solid fa-plus mx-2"></i>Create revision</a><li>
             </div>
       </div>                    
@@ -14,7 +14,7 @@
 
 <div id="msg_rev"></div>
 
-<table id="tdRevisions" class="table table-striped table-bordered" style="width:100%">
+<table id="tdRevisions" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Revision ID</th>
@@ -25,7 +25,7 @@
    </thead>
 </table>
 
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function() {
 
 	$('[data-bs-toggle="tooltip"]').tooltip();
@@ -92,7 +92,7 @@ function actions(data, type, row){
 		return '<strong>Current revision</strong>';
 	}
 	data = '<div class="dropdown">' +
-			'<button type="button" class="btn btn-primary btn-floating dropdown-toggle hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+			'<button type="button" class="btn btn-floating hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
 				'<ul class="dropdown-menu dropdown-menu-right">';
 	data += '<li><a href="#" id="cmpRev" data-id="'+row.fid+'" data-revision="'+row.revision+'" class="dropdown-item" title="Compare with the current revision" rel="tip"><i class="fas fa-greater-than-equal mx-2"></i>Compare</a></li>';		
 	data += '<li><a href="#" id="restore" class="dropdown-item" data-id="'+row.fid+'" data-revision="'+row.revision+'"><i class="fas fa-history mx-2"></i>Restore</a></li>';
diff --git a/pages/views/formula/sell_formula.php b/pages/views/formula/sell_formula.php
index 96a11fb8..4e015321 100644
--- a/pages/views/formula/sell_formula.php
+++ b/pages/views/formula/sell_formula.php
@@ -23,8 +23,8 @@
 ?>
 
 
-<div>
-   <div class="btn-group noexport" id="menu">
+<div class="mt-4 mr-4 text-right">
+   <div class="btn-group" id="menu">
         <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
         <div class="dropdown-menu dropdown-menu-left">
            <li><a href="#" class="dropdown-item" id="export_pdf"><i class="fa-solid fa-file-export mx-2"></i>Export to PDF</a></li>
@@ -32,7 +32,7 @@
     </div>
 </div>
 <hr />
-<table id="formula" class="table table-striped table-bordered nowrap">
+<table id="formula" class="table table-striped">
     <thead>
         <tr>
             <th>Ingredient</th>
@@ -62,9 +62,15 @@
 var myFID = "<?=$meta['fid']?>";
 var myFNAME = "<?=$meta['name']?>";
 var watermarkText = "<?=$_POST['watermarkText']?>";
-var watermarkTextSize = "<?=$_POST['watermarkTextSize']?>";
+var watermarkTextOp =  parseFloat("<?=$_POST['watermarkTextOp']?>");
 var orientation = "<?=$_POST['orientation']?>";
 var qStep = "<?=$_POST['qStep']?>";
+var fid = "<?=$id?>";
+var fontSize = parseInt("<?=$_POST['fontSize']?>");
+var image = "<?php echo $settings['brandLogo'] ?: "data:image/png;base64,".base64_encode(file_get_contents(__ROOT__.'/img/logo_def.png')); ?>";
+
+var logoSizeW = parseInt("<?=$_POST['logoSizeW'] ?: 200 ?>");
+var logoSizeH = parseInt("<?=$_POST['logoSizeH'] ?: 200 ?>");
 
 var formula_table = $('#formula').DataTable( {
 	columnDefs: [
@@ -75,17 +81,31 @@
 	buttons: [
       {
         extend: "pdfHtml5",
-		orientation: "landscape",
+		footer: true,
+		orientation: orientation,
         title: myFNAME,
         messageBottom: function(){return new Date().toString()},
-        messageTop: $("#customerID").val()
+        messageTop: $("#customerID").val(),
+		customize: function ( doc ) {
+			doc.styles.tableHeader.fontSize = fontSize;
+			doc.styles.tableFooter.fontSize = fontSize;
+			doc.content.splice( 1, 0, {
+				margin: [ 0, 0, 0, 12 ],
+				alignment: 'center',
+				image: image,
+				width: logoSizeW,
+				height: logoSizeH,
+			});
+			doc.watermark =  {text: watermarkText, color: 'blue', opacity: watermarkTextOp,  bold: false, italics: false};
+			doc.defaultStyle.fontSize = fontSize;          
+		},
       }
     ],
 	processing: false,
 	ajax: {
 		url: '/core/full_formula_data.php',
 		data: {
-			id: <?=$id?>,
+			id: fid,
 			qStep: qStep
 		}
 	 },
@@ -98,15 +118,15 @@
 			   { data : 'concentration', title: 'Concentration%'},
 			   { data : 'ingredient.desc', title: 'Properties'},
 			  ],
-	footerCallback : function( tfoot, data, start, end, display ) {    
+	 footerCallback : function( tfoot, data, start, end, display ) {    
   
-	  var response = this.api().ajax.json();
-	  if(response){
-		 var $td = $(tfoot).find('th');
-		 $td.eq(0).html("Ingredients: " + response.meta['total_ingredients'] );
-		 $td.eq(4).html("Total: " + response.meta['total_quantity']);
-	 }
-  },
+		 var response = this.api().ajax.json();
+		 if(response){
+			 var $td = $(tfoot).find('th');
+			 $td.eq(0).html("Ingredients: " + response.meta['total_ingredients'] );
+			 $td.eq(4).html("Total: " + response.meta['total_quantity']);
+		 }
+  	},
   
 	order: [[ 0, 'asc' ]],
 	lengthMenu: [[200, 500, -1], [200, 500, "All"]],
@@ -115,25 +135,7 @@
 	  
 });
 
-
-	
-$('#export_pdf').on('click',function(){
-  $("#formula").tableHTMLExport({
-	type:'pdf',
-	filename: myFNAME + '.pdf',
-	orientation: orientation,
-	trimContent: true,
-    quoteFields: true,
-	ignoreColumns: '.noexport',
-  	ignoreRows: '.noexport',
-	htmlContent: true,
-	cover: '<?php echo base64_encode(wordwrap($meta['notes'],100));?>',
-	maintitle: myFNAME,
-	subtitle: $("#customerID").val(),
-	product: '<?php echo trim($product).' '.trim($ver);?>',
-	watermarkText: watermarkText,
-	watermarkTextSize: watermarkTextSize
-  });
+$('#export_pdf').click(() => {
+    $('#formula').DataTable().button(0).trigger();
 });
-
 </script>
\ No newline at end of file
diff --git a/pages/views/formula/timeline.php b/pages/views/formula/timeline.php
index 9a87a3f1..d7307c76 100644
--- a/pages/views/formula/timeline.php
+++ b/pages/views/formula/timeline.php
@@ -2,7 +2,7 @@
 <hr>
 <div class="card-body">
   <div>
-    <table class="table table-bordered" id="tdHistory" width="100%" cellspacing="0">
+    <table class="table table-striped" id="tdHistory" width="100%" cellspacing="0">
       <thead>
           <tr>
               <th>Changes</th>
@@ -14,7 +14,7 @@
   </div>
 </div>
 
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function(){
 
 	var tdHistory = $('#tdHistory').DataTable( {
@@ -35,13 +35,12 @@
 		data: {
 				id: '<?=$_GET['id']?>',
 			},
-		},
+	},
 	columns: [
 			  { data : 'change_made', title: 'Changes' },
 			  { data : 'date_time', title: 'Date' },
 			  { data : 'user', title: 'User' },
 			],
-	
 	order: [[ 1, 'desc' ]],
 	lengthMenu: [[15, 50, 100, -1], [15, 50, 100, "All"]],
 	pageLength: 15,
diff --git a/pages/views/ingredients/compos.php b/pages/views/ingredients/compos.php
index e88f4efe..d14ebc29 100644
--- a/pages/views/ingredients/compos.php
+++ b/pages/views/ingredients/compos.php
@@ -30,7 +30,7 @@
 	</div>
 </div>
 
-<table id="tdCompositions" class="table table-striped table-bordered" style="width:100%">
+<table id="tdCompositions" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Name</th>
@@ -48,7 +48,7 @@
 </table>
 
 
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function() {
 	
 
@@ -60,7 +60,7 @@
   	tdCompositions = $('#tdCompositions').DataTable( {
 		columnDefs: [
 			{ className: 'text-center', targets: '_all' },
-			{ orderable: false, targets: [5, 7] },
+			{ orderable: false, targets: [5, 9] },
 		],
 		dom: 'lfrtip',
 		processing: true,
diff --git a/pages/views/ingredients/ingDocuments.php b/pages/views/ingredients/ingDocuments.php
index 28218c69..f38de198 100644
--- a/pages/views/ingredients/ingDocuments.php
+++ b/pages/views/ingredients/ingDocuments.php
@@ -22,7 +22,7 @@
 
 
 </div>
-<table id="tdIngDocs" class="table table-striped table-bordered" style="width:100%">
+<table id="tdIngDocs" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Document</th>
@@ -33,7 +33,7 @@
       </tr>
    </thead>
 </table>
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function() {
 	
 	$('[data-bs-toggle="tooltip"]').tooltip();
diff --git a/pages/views/ingredients/ingSuppliers.php b/pages/views/ingredients/ingSuppliers.php
index 28fe319e..de00fed3 100644
--- a/pages/views/ingredients/ingSuppliers.php
+++ b/pages/views/ingredients/ingSuppliers.php
@@ -19,6 +19,8 @@
 }
 ?>
 <?php if($_GET['standAlone'] == 1){ ?>
+	<html lang="en" data-bs-theme="<?=$settings['bs_theme']?>">
+
 	<link href="/css/fontawesome-free/css/all.min.css" rel="stylesheet" type="text/css">
     
 	<script src="/js/jquery/jquery.min.js"></script>
@@ -39,7 +41,7 @@
     <style>
 		body { margin: 10; }
 	</style>
-    
+    </html>
 <?php } ?>
 
 <h3>Suppliers</h3>
@@ -49,7 +51,7 @@
   <div class="text-right">
     <div class="btn-group">
     <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
-        <div class="dropdown-menu dropdown-menu-right">
+        <div class="dropdown-menu dropdown-menu-left">
             <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#addSupplier"><i class="fa-solid fa-plus mx-2"></i>Add new</a></li>
         </div>
     </div>                    
@@ -57,7 +59,7 @@
 
 
 </div>
-<table id="tdIngSup" class="table table-striped table-bordered" style="width:100%">
+<table id="tdIngSup" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Name</th>
@@ -79,7 +81,7 @@
       </tr>
    </thead>
 </table>
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function() {
 	$("#supplier_name").change(function () {
     	vol = $(this).children(':selected').data('vol');
@@ -271,8 +273,8 @@ function storage_location(data, type, row){
 
 function sActions(data, type, row){
 	data = '<div class="dropdown">' +
-			'<button type="button" class="btn btn-primary btn-floating dropdown-toggle hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
-				'<ul class="dropdown-menu dropdown-menu-right">';
+			'<button type="button" class="btn btn-floating hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+				'<ul class="dropdown-menu">';
 	
 	if(row.preferred == 0){
 		data += '<li><a class="dropdown-item" href="#" id="prefSID" data-status="1" data-id="'+row.ingSupplierID+'"><i class="far fa-star pv_point_gen mx-2"></i>Set as preferred</a></li>';
diff --git a/pages/views/ingredients/pubChem.php b/pages/views/ingredients/pubChem.php
index ff93aa5f..8fd8ce92 100644
--- a/pages/views/ingredients/pubChem.php
+++ b/pages/views/ingredients/pubChem.php
@@ -71,42 +71,40 @@
 });
 </script>
 <h3>Pub Chem Data</h3>
-<div class="col dropdown-divider"></div>
-<div class="card rounded" id="pubChemDataJ">
-    <div class="card-body"> 
-        <div class="col-sm-6">
-            <div class="col-sm-5">
-                <img alt="Structure image" src="<?php echo $image;?>"/>
-            </div>
-            <div class="row">
-            	<div class="col">
-                	Molecular Formula: <label><?php echo $molecularFormula;?></label>
-            	</div>
-            </div>
-
-             <div class="row">
-             	<div class="col">
-                	Canonical Smiles: <label><?php echo $CanonicalSMILES;?></label>
-            	</div>
-             </div>
-             <div class="row">
-             	<div class="col">
-                	Mass: <label><?php echo $ExactMass;?></label>
-            	</div>
-             </div>
-             <div class="row">
-             	<div class="col">
-                	XLogP: <label><?php echo $logP;?></label>
-            	</div>
-             </div> 
-             <div class="col dropdown-divider"></div>
-             <div class="row mt-2">
-             	<div class="col">
-                	<input type="submit" class="btn btn-primary" name="btnUpdatePub" id="btnUpdatePub" value="Update data" />
-            	</div>
-             </div>                          
+<div class="container">
+  <div class="row">
+    <div class="col-md-2">
+      <img src="<?php echo $image;?>" class="img-fluid d-block" alt="Molecule Image" />
+    </div>
+    <div class="col-md-10">
+      <div class="row mb-2">
+        <div class="col-md-2">Molecular Formula</div>
+        <div class="col-md-8"><strong><?php echo $molecularFormula;?></strong></div>
+      </div>
+      <div class="row mb-2">
+        <div class="col-md-2">Molecular Weight</div>
+        <div class="col-md-8"><strong><?php echo $molecularWeight;?></strong></div>
+      </div>
+      <div class="row mb-2">
+        <div class="col-md-2">Canonical Smiles</div>
+        <div class="col-md-8"><strong><?php echo $CanonicalSMILES;?></strong></div>
+      </div>
+      <div class="row mb-2">
+        <div class="col-md-2">Mass</div>
+        <div class="col-md-8"><strong><?php echo $ExactMass;?></strong></div>
+      </div>
+      <div class="row mb-2">
+        <div class="col-md-2">XLogP</div>
+        <div class="col-md-8"><strong><?php echo $logP;?></strong></div>
+      </div>
+      <div class="row">
+        <div class="col-12">
+          <input type="submit" class="btn btn-primary" name="btnUpdatePub" id="btnUpdatePub" value="Update data" />
         </div>
+      </div>
     </div>
+  </div>
 </div>
 
 
+
diff --git a/pages/views/ingredients/repData.php b/pages/views/ingredients/repData.php
index ff216073..f9e63679 100644
--- a/pages/views/ingredients/repData.php
+++ b/pages/views/ingredients/repData.php
@@ -27,19 +27,19 @@
 	</div>
 </div>
 
-<table id="tdReplacements" class="table table-striped table-bordered" style="width:100%">
+<table id="tdReplacements" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Name</th>
           <th>CAS</th>
           <th>Notes</th>
-          <th>Actions</th>
+          <th></th>
       </tr>
    </thead>
 </table>
 
 
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function() {
 
 $('[data-bs-toggle="tooltip"]').tooltip();
@@ -69,7 +69,7 @@
 			  { data : null, title: 'Name', render: repName },
 			  { data : 'ing_rep_cas', title: 'CAS' },
 			  { data : 'notes', title: 'Notes', render: repNotes },
-			  { data : null, title: 'Actions', render: repActions },		   
+			  { data : null, title: '', render: repActions },		   
 			 ],
 	order: [[ 1, 'asc' ]],
 	lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]],
diff --git a/pages/views/ingredients/safetyData.php b/pages/views/ingredients/safetyData.php
index 5996d6a7..93f67da7 100644
--- a/pages/views/ingredients/safetyData.php
+++ b/pages/views/ingredients/safetyData.php
@@ -32,7 +32,7 @@
     position: absolute;
     top: 5px;
     right: 5px;
-    background-color: white;
+    background-color: var( --bs-body-bg);
     border-radius: 50%;
     padding: 5px;
     cursor: pointer;
diff --git a/pages/views/ingredients/synonyms.php b/pages/views/ingredients/synonyms.php
index ed9cc970..d2f396ee 100644
--- a/pages/views/ingredients/synonyms.php
+++ b/pages/views/ingredients/synonyms.php
@@ -27,7 +27,7 @@
 	</div>
 </div>
 
-<table id="tdSynonyms" class="table table-striped table-bordered" style="width:100%">
+<table id="tdSynonyms" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Synonym</th>
@@ -38,7 +38,7 @@
 </table>
 
 
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function() {
 
 $('[data-bs-toggle="tooltip"]').tooltip();
diff --git a/pages/views/ingredients/usageData.php b/pages/views/ingredients/usageData.php
index 3a656b20..c8663bc7 100644
--- a/pages/views/ingredients/usageData.php
+++ b/pages/views/ingredients/usageData.php
@@ -124,7 +124,7 @@
 	function unlimited_usage(status,maxulimit){
 		$('#usage_type').prop('disabled', status);
 		<?php foreach ($cats as $cat) {?>
-			$('#cat<?php echo $cat['name'];?>').prop('readonly', status).val(maxulimit);
+			$('#cat<?php echo $cat['name'];?>').prop('disabled', status).val(maxulimit);
 		<?php } ?>
 	}
 	
diff --git a/pages/views/ingredients/whereUsed.php b/pages/views/ingredients/whereUsed.php
index cc27949d..86433550 100644
--- a/pages/views/ingredients/whereUsed.php
+++ b/pages/views/ingredients/whereUsed.php
@@ -26,7 +26,7 @@
 <h3><?=$ingID?> is used in <?=count((array)$used)?> formulas</h3>
 <?php if(count((array)$used)){ ?>
 <div class="where_used mb-3">
-    <table class="table table-bordered dataTable no-footer"> 
+    <table class="table table-striped"> 
         <thead>
             <tr>
                 <th>Formula name</th>
diff --git a/pages/views/pvOnline/marketPlace.php b/pages/views/pvOnline/marketPlace.php
index 660bd434..e2bce12d 100644
--- a/pages/views/pvOnline/marketPlace.php
+++ b/pages/views/pvOnline/marketPlace.php
@@ -4,12 +4,12 @@
   <div>
   <div class="card shadow mb-4">
     <div class="card-header py-3">
-      <h2 class="m-0 font-weight-bold text-primary"><i id="reload_data" class="pv_point_gen">Marketplace</i></h2>
+      <h2 class="m-0 font-weight-bold text-primary-emphasis"><i id="reload_data" class="pv_point_gen">Marketplace</i></h2>
     </div>
     <div class="card-body">
       <div class="table-responsive">
       <div id="data_area">
-       		<table id="all-table-market" class="table table-bordered" width="100%" cellspacing="0">
+       		<table id="all-table-market" class="table table-striped" width="100%" cellspacing="0">
             	<thead>
                 	<tr>
                     	<th>Formula Name</th>
@@ -256,7 +256,7 @@ function status(data, type, row, meta){
 
 function actions(data, type, row, meta){
 		data = '<div class="dropdown">' +
-        '<button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+        '<button type="button" class="btn" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
             '<ul class="dropdown-menu dropdown-menu-right">';
 		
 		data += '<li><i class="pv_point_gen pv_gen_li dropdown-item" id="import-market-formula" data-id="'+row.id+'" data-name="'+row.name+'" rel="tip" title="Import '+ row.name +' to my database" ><i class="fas fa-download mx-2"></i>Import Formula</i></li>';
diff --git a/pages/views/regulatory/listSDS.php b/pages/views/regulatory/listSDS.php
index 1cff073a..b8c5127a 100644
--- a/pages/views/regulatory/listSDS.php
+++ b/pages/views/regulatory/listSDS.php
@@ -38,7 +38,7 @@
          </tr>
         </table>
 
-        <table class="table table-bordered" id="tdDataSDS" width="100%" cellspacing="0">
+        <table class="table table-striped" id="tdDataSDS" width="100%" cellspacing="0">
           <thead>
             <tr>
               <th>Product</th>
diff --git a/pages/views/regulatory/wizard.php b/pages/views/regulatory/wizard.php
index 1505ae04..d6a153d8 100644
--- a/pages/views/regulatory/wizard.php
+++ b/pages/views/regulatory/wizard.php
@@ -10,7 +10,7 @@
 
 ?>
 <!doctype html>
-<html lang="en">
+<html lang="en" data-bs-theme="<?=$settings['bs_theme']?>">
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="icon" type="image/png" sizes="32x32" href="/img/favicon-32x32.png">
diff --git a/pages/views/settings/about.php b/pages/views/settings/about.php
index d030eb3f..acfcb327 100755
--- a/pages/views/settings/about.php
+++ b/pages/views/settings/about.php
@@ -3,32 +3,29 @@
 
 require_once(__ROOT__.'/inc/sec.php');
 require_once(__ROOT__.'/inc/opendb.php');
-
 require_once(__ROOT__.'/inc/settings.php');
 
 ?>
-<table width="100%" border="0">
-  <tr>
-    <td><strong>Perfumer's Vault Pro</strong></td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td>&nbsp;</td>
-    <td>&nbsp;</td>
-  </tr>
-  <tr>
-    <td><p>A sophisticated tool to help perfumers organize their formulas, ingredients and inventory.
-    </p>
-      <pre><?php echo file_get_contents(__ROOT__.'/LICENSE.txt');?></pre>
-</td>
-  </tr>
-  <tr>
-    <td>
-    <p>Version: <strong><?php echo file_get_contents(__ROOT__.'/VERSION.md');?></strong> PRO</p>
-    <p>DB Schema Version: <strong><?php echo $pv_meta['schema_ver'];?></strong></p>
-    <p>Release <a href="CHANGELOG.md" target="_blank"><strong>CHANGELOG</strong></a></p>
-    <p><a href="https://www.perfumersvault.com" target="_blank">https://www.perfumersvault.com</a></p>
-    <p>Theme by <a href="https://startbootstrap.com/theme/sb-admin-2/" target="_blank"><strong>SB Admin 2</strong></a></p>
-    </td>
-  </tr>
-</table>
+<div class="row">
+    <div class="col">
+        <strong>Perfumer's Vault Pro</strong>
+    </div>
+</div>
+<div class="row my-4">
+    <div class="col"></div>
+</div>
+<div class="row">
+    <div class="col">
+        <p>A sophisticated tool to help perfumers organize their formulas, ingredients, and inventory.</p>
+        <pre><?php echo file_get_contents(__ROOT__.'/LICENSE.txt');?></pre>
+    </div>
+</div>
+<div class="row">
+    <div class="col">
+        <p>Version: <strong><?php echo file_get_contents(__ROOT__.'/VERSION.md');?></strong> PRO</p>
+        <p>DB Schema Version: <strong><?php echo $pv_meta['schema_ver'];?></strong></p>
+        <p>Release <a href="CHANGELOG.md" target="_blank"><strong>CHANGELOG</strong></a></p>
+        <p><a href="https://www.perfumersvault.com" target="_blank">https://www.perfumersvault.com</a></p>
+        <p>Theme based in <a href="https://startbootstrap.com/theme/sb-admin-2/" target="_blank"><strong>SB Admin 2</strong></a></p>
+    </div>
+</div>
diff --git a/pages/views/settings/api.php b/pages/views/settings/api.php
index 263f92e7..99b5a1b5 100644
--- a/pages/views/settings/api.php
+++ b/pages/views/settings/api.php
@@ -9,54 +9,49 @@
 ?>
 
 <h6>API can be used to access PV Pro from other apps like PV Mobile APP</h6>
-<div class="dropdown-divider"></div>
-
-	   <table width="100%" border="0">
-		<tr>
-	      <td colspan="3"><div id="pvAPIMsg"></div></td>
-	      </tr>
-	    <tr>
-	      <td width="9%" height="28">Enable API</td>
-	      <td width="9%" valign="middle"><input name="pv_api" type="checkbox" id="pv_api" value="1" <?php if($settings['api'] == '1'){ ?> checked="checked" <?php } ?>/></td>
-	      <td width="82%">&nbsp;</td>
-	      </tr>
-	    <tr>
-	      <td>API Key</td>
-	      <td valign="middle"><input name="pv_api_key" type="text" class="form-control" id="pv_api_key" value="<?=$settings['api_key']?>" /></td>
-	      <td>&nbsp;</td>
-	      </tr>
-	    <tr>
-	      <td>&nbsp;</td>
-	      <td valign="middle">&nbsp;</td>
-	      <td>&nbsp;</td>
-	      </tr>
-	    <tr>
-	      <td><input type="submit" name="save-api" id="save-api" value="Submit" class="btn btn-info"/></td>
-	      <td valign="middle">&nbsp;</td>
-	      <td>&nbsp;</td>
-	      </tr>
-	    </table> 
+<hr />
+
+<div class="row mb-3">
+    <div class="col-2">
+        <label for="pv_api">Enable API</label>
+        <input class="mx-2" name="pv_api" type="checkbox" id="pv_api" value="1" 
+        <?php if($settings['api'] == '1'){ ?> checked="checked" <?php } ?>/>
+    </div>
+</div>
+<div class="row mb-3">
+    <div class="col-4">
+        <label for="pv_api_key">API Key</label>
+        <input name="pv_api_key" type="text" class="form-control" id="pv_api_key" value="<?=$settings['api_key']?>" />
+    </div>
+</div>
+<div class="col-2">
+    <input type="submit" name="save-api" id="save-api" value="Submit" class="btn btn-primary"/>
+</div>
 
-<script>
 
-$('#save-api').click(function() {
-	$.ajax({ 
-		url: '/pages/update_settings.php', 
-		type: 'POST',
-		data: {
-			manage: 'api',		
-			api: $("#pv_api").is(':checked'),
-			api_key: $("#pv_api_key").val(),
-		},
-		dataType: 'json',
-		success: function (data) {
-			if(data.success) {
-				var msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.success + '</div>';
-			} else {
-				var msg = '<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.error + '</div>';
+<script>
+$(document).ready(function() {
+	$('#save-api').click(function() {
+		$.ajax({ 
+			url: '/pages/update_settings.php', 
+			type: 'POST',
+			data: {
+				manage: 'api',		
+				api: $("#pv_api").is(':checked'),
+				api_key: $("#pv_api_key").val(),
+			},
+			dataType: 'json',
+			success: function (data) {
+				if(data.success){
+					$('#toast-title').html('<i class="fa-solid fa-circle-check mx-2"></i>' + data.success);
+					$('.toast-header').removeClass().addClass('toast-header alert-success');
+				} else if(data.error) {
+					$('#toast-title').html('<i class="fa-solid fa-warning mx-2"></i>' + data.error);
+					$('.toast-header').removeClass().addClass('toast-header alert-danger');
+				}
+				$('.toast').toast('show');
 			}
-			$('#pvAPIMsg').html(msg);
-		}
+		});
 	});
 });
 
diff --git a/pages/views/settings/branding.php b/pages/views/settings/branding.php
index 50ff984a..fd61213a 100644
--- a/pages/views/settings/branding.php
+++ b/pages/views/settings/branding.php
@@ -3,7 +3,6 @@
 
 require_once(__ROOT__.'/inc/sec.php');
 require_once(__ROOT__.'/inc/opendb.php');
-
 require_once(__ROOT__.'/inc/settings.php');
 
 ?>
@@ -14,36 +13,34 @@
       <div class="col-md-8">
         <div id="brandMsg"></div>
         
-          <div class="row">
-            <label class="col-sm-3 control-label">Brand Name:</label>
+          <div class="row mb-3">
+            <label class="col-sm-1 control-label">Brand Name</label>
             <div class="col-sm-8">
               <input name="brandName" type="text" class="form-control" id="brandName" value="<?php echo $settings['brandName'];?>" />
             </div>
           </div>
-          <div class="row">
-            <label class="col-sm-3 control-label">Address:</label>
+          <div class="row mb-3">
+            <label class="col-sm-1 control-label">Address</label>
             <div class="col-md-8">
               <input name="brandAddress" type="text" class="form-control" id="brandAddress" value="<?php echo $settings['brandAddress'];?>"/>
             </div>
           </div>
-          <div class="row">
-            <label class="col-sm-3 control-label">Email:</label>
+          <div class="row mb-3">
+            <label class="col-sm-1 control-label">Email</label>
             <div class="col-md-8">
               <input name="brandEmail" type="text" class="form-control" id="brandEmail" value="<?php echo $settings['brandEmail'];?>" />
             </div>
           </div>
-          <div class="row">
-            <label class="col-sm-3 control-label">Contact No:</label>
+          <div class="row mb-3">
+            <label class="col-sm-1 control-label">Contact No</label>
             <div class="col-md-8">
               <input name="brandPhone" type="text" class="form-control" id="brandPhone" value="<?php echo $settings['brandPhone'];?>" />
             </div>
           </div>          
           <div class="dropdown-divider"></div>
           <div class="form-row">
-			<div class="col-sm-12">
-				<div class="text-right">
-					<button type="button" id="save-brand" name="save-brand" class="btn btn-primary">Update</button>
-				</div>
+			<div class="col-sm-1">
+				<button type="button" id="save-brand" name="save-brand" class="btn btn-primary">Update</button>
 			</div>
           </div>
       </div>
@@ -55,75 +52,79 @@
         <div class="dropdown-divider"></div>
         <div class="col-xl-12 col-lg-12 col-md-12 col-sm-12 col-12">
 			<div class="text-right mt-3">
-        		<input type="button" class="btn btn-info" value="Upload" id="brandLogo_upload" />
+        		<input type="button" class="btn btn-primary" value="Upload" id="brandLogo_upload" />
         	</div>
         </div>
       </div>
   </div>
 </div>
-<hr>
+
 <script>
-$('#brandLogo_pic').html('<img class="img-profile-avatar" src="<?=$settings['brandLogo']?: '/img/logo_def.png'; ?>">');
+$(document).ready(function() {
 
-$('#save-brand').click(function() {
-	$.ajax({ 
-		url: '/pages/update_settings.php', 
-		type: 'POST',
-		data: {
-			manage: 'brand',
-			brandName: $("#brandName").val(),
-			brandAddress: $("#brandAddress").val(),
-			brandEmail: $("#brandEmail").val(),
-			brandPhone: $("#brandPhone").val()
-		},
-		dataType: 'json',
-		success: function (data) {
-			if(data.success) {
-				var msg = '<div class="alert alert-success">' + data.success + '</div>';
-			}else{
-				var msg = '<div class="alert alert-danger">' + data.error + '</div>';
+	$('#brandLogo_pic').html('<img class="img-profile-avatar" src="<?=$settings['brandLogo']?: '/img/logo_def.png'; ?>">');
+	
+	$('#save-brand').click(function() {
+		$.ajax({ 
+			url: '/pages/update_settings.php', 
+			type: 'POST',
+			data: {
+				manage: 'brand',
+				brandName: $("#brandName").val(),
+				brandAddress: $("#brandAddress").val(),
+				brandEmail: $("#brandEmail").val(),
+				brandPhone: $("#brandPhone").val()
+			},
+			dataType: 'json',
+			success: function (data) {
+				if(data.success) {
+					var msg = '<div class="alert alert-success"><i class="fa-solid fa-circle-check mx-2"></i>' + data.success + '</div>';
+				}else{
+					var msg = '<div class="alert alert-danger"><i class="fa-solid fa-triangle-exclamation mx-2"></i>' + data.error + '</div>';
+				}
+				$('#brandMsg').html(msg);
 			}
-			$('#brandMsg').html(msg);
-		}
+		});
 	});
-});
 
-$("#brandLogo_upload").click(function(){
-	$("#brandMsg").html('<div class="alert alert-info">Please wait, file upload in progress....</div>');
-	$("#brandLogo_upload").prop("disabled", true);
-    $("#brandLogo_upload").prop('value', 'Please wait...');
+	$("#brandLogo_upload").click(function(){
+		$("#brandMsg").html('<div class="alert alert-info">Please wait, file upload in progress....</div>');
+		$("#brandLogo_upload").prop("disabled", true);
+    	$("#brandLogo_upload").prop('value', 'Please wait...');
 		
-	var fd = new FormData();
-    var files = $('#brandLogo')[0].files;
+		var fd = new FormData();
+    	var files = $('#brandLogo')[0].files;
         
-    if(files.length > 0 ){
-    	fd.append('brandLogo',files[0]);
-        $.ajax({
-		  url: '/pages/upload.php?type=brand',
-		  type: 'POST',
-		  data: fd,
-		  dataType: 'json',
-		  contentType: false,
-		  processData: false,
-		  success: function(response){
-			 if(response.success){
-				$("#brandMsg").html(response);
-				$("#brandLogo_upload").prop("disabled", false);
-				$("#brandLogo_upload").prop('value', 'Upload');
-				$('#brandLogo_pic').html('<img class="img-profile-avatar" src="'+response.success.pic+'">');
+    	if(files.length > 0 ){
+    		fd.append('brandLogo',files[0]);
+        	$.ajax({
+		  		url: '/pages/upload.php?type=brand',
+				type: 'POST',
+				data: fd,
+				dataType: 'json',
+				contentType: false,
+				processData: false,
+				success: function(response){
+			 		if(response.success){
+						$("#brandMsg").html(response);
+						$("#brandLogo_upload").prop("disabled", false);
+						$("#brandLogo_upload").prop('value', 'Upload');
+						$('#brandLogo_pic').html('<img class="img-profile-avatar" src="'+response.success.pic+'">');
 
-			 }else{
-				$("#brandMsg").html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+response.error+'</div>');
-				$("#brandLogo_upload").prop("disabled", false);
-				$("#brandLogo_upload").prop('value', 'Upload');
-			 }
-		  },
-	   });
-    }else{
-		$("#brandMsg").html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><strong>Error:</strong> Please select a file to upload!</div>');
-		$("#brandLogo_upload").prop("disabled", false);
-		$("#brandLogo_upload").prop('value', 'Upload');
+					}else{
+						$("#brandMsg").html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>'+response.error+'</div>');
+						$("#brandLogo_upload").prop("disabled", false);
+						$("#brandLogo_upload").prop('value', 'Upload');
+				    }
+		  		},
+	   	});
+    	}else{
+			$("#brandMsg").html('<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><i class="fa-solid fa-triangle-exclamation mx-2"></i>Please select a file to upload</div>');
+			$("#brandLogo_upload").prop("disabled", false);
+			$("#brandLogo_upload").prop('value', 'Upload');
 		}
-	});	
+	});
+		
+});	
 
 </script>
\ No newline at end of file
diff --git a/pages/views/settings/general.php b/pages/views/settings/general.php
index 6848d2e0..a3ee7fcd 100644
--- a/pages/views/settings/general.php
+++ b/pages/views/settings/general.php
@@ -98,13 +98,19 @@
           </select>
         </div>
     
-      </div>
-      
-
+        <div class="form-group col-md-6">
+          <label for="bs_theme">Theme</label><a href="#" class="ml-2 fas fa-question-circle" rel="tip" title="Requires a page refresh for the changes to take effect"></a>
+          <select name="bs_theme" id="bs_theme" class="form-control">
+            <option value="light" <?php if($settings['bs_theme']=="light") echo 'selected="selected"'; ?> >Light</option>
+            <option value="dark" <?php if($settings['bs_theme']=="dark") echo 'selected="selected"'; ?> >Dark</option>
+          </select>
+        </div>
+        
+    </div>
 </div>
     
     <div class="col-sm-2">
-     <h4 class="m-0 mb-4 text-primary">Pyramid View</h4>
+     <h4 class="m-0 mb-4">Pyramid View</h4>
      <div class="form-row">
         <div class="form-group col-md-auto">
           <label for="top_n" id="top">Top notes %</label>
@@ -141,8 +147,7 @@
         
         <div class="form-group col-md-auto">
             <input name="multi_dim_perc" type="checkbox" id="multi_dim_perc" value="1" <?php if($settings['multi_dim_perc'] == '1'){ ?> checked="checked" <?php } ?>/>
-            <label class="form-check-label" for="multi_dim_perc">Multi-dimensional lookup</label>
-            <a href="#" class="fas fa-question-circle" rel="tip" title="Enable to include into formulas limits calculation the ingredient's sub materials if exists."></a>
+            <label class="form-check-label" for="multi_dim_perc">Multi-dimensional lookup</label><a href="#" class="ml-2 fas fa-question-circle" rel="tip" title="Enable to include into formulas limits calculation the ingredient's sub materials if exists."></a>
         </div>
    </div>
      
@@ -158,58 +163,65 @@
 </div>
 
 <script>
-$('#save-general').click(function() {
-	$.ajax({ 
-		url: '/pages/update_settings.php', 
-		type: 'POST',
-		data: {
-			manage: 'general',
-			currency: $("#currency").val(),
-			top_n: $("#top_n").val(),
-			heart_n: $("#heart_n").val(),
-			base_n: $("#base_n").val(),
-			qStep: $("#qStep").val(),
-			defCatClass: $("#defCatClass").val(),
-			pubchem_view: $("#pubchem_view").val(),
-			grp_formula: $("#grp_formula").val(),
-			chem_vs_brand: $("#chem_vs_brand").is(':checked'),
-			pubChem: $("#pubChem").is(':checked'),
-			chkVersion: $("#chkVersion").is(':checked'),
-			multi_dim_perc: $("#multi_dim_perc").is(':checked'),
-			mUnit: $("#mUnit").val(),
-			editor: $("#editor").val(),
-			user_pref_eng: $("#user_pref_eng").val(),
-			pv_host: $("#pvHost").val(),
-			defPercentage: $("#defPercentage").val()
+$(document).ready(function() {
 
-	},
-	dataType: 'json',
-	success: function (data) {
-		if(data.success){
-			$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-			$('.toast-header').removeClass().addClass('toast-header alert-success');
-		} else if(data.error) {
-			$('#toast-title').html('<i class="fa-solid fa-warning mr-2"></i>' + data.error);
-			$('.toast-header').removeClass().addClass('toast-header alert-danger');
+	$('[rel=tip]').tooltip();
+	$('#save-general').click(function() {
+		$.ajax({ 
+			url: '/pages/update_settings.php', 
+			type: 'POST',
+			data: {
+				manage: 'general',
+				currency: $("#currency").val(),
+				top_n: $("#top_n").val(),
+				heart_n: $("#heart_n").val(),
+				base_n: $("#base_n").val(),
+				qStep: $("#qStep").val(),
+				defCatClass: $("#defCatClass").val(),
+				pubchem_view: $("#pubchem_view").val(),
+				grp_formula: $("#grp_formula").val(),
+				chem_vs_brand: $("#chem_vs_brand").is(':checked'),
+				pubChem: $("#pubChem").is(':checked'),
+				chkVersion: $("#chkVersion").is(':checked'),
+				multi_dim_perc: $("#multi_dim_perc").is(':checked'),
+				mUnit: $("#mUnit").val(),
+				editor: $("#editor").val(),
+				user_pref_eng: $("#user_pref_eng").val(),
+				pv_host: $("#pvHost").val(),
+				defPercentage: $("#defPercentage").val(),
+				bs_theme: $("#bs_theme").val()
+	
+		},
+		dataType: 'json',
+		success: function (data) {
+			if(data.success){
+				$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+				$('.toast-header').removeClass().addClass('toast-header alert-success');
+			} else if(data.error) {
+				$('#toast-title').html('<i class="fa-solid fa-warning mr-2"></i>' + data.error);
+				$('.toast-header').removeClass().addClass('toast-header alert-danger');
+			}
+			$('.toast').toast('show');
 		}
-		$('.toast').toast('show');
-	}
-  });
-});
-
-$('#top').text('Top notes ' + $('#top_n').val() + '%');
-$('#heart').text('Heart notes ' + $('#heart_n').val() + '%');
-$('#base').text('Base notes ' + $('#base_n').val() + '%');
-
-$('#top_n').on('input', function(){
-    $('#top').text('Top notes ' + $('#top_n').val() + '%');
+	  });
+	});
+	
+	$('#top').text('Top notes ' + $('#top_n').val() + '%');
+	$('#heart').text('Heart notes ' + $('#heart_n').val() + '%');
+	$('#base').text('Base notes ' + $('#base_n').val() + '%');
+	
+	$('#top_n').on('input', function(){
+		$('#top').text('Top notes ' + $('#top_n').val() + '%');
+	});
+	
+	$('#heart_n').on('input', function(){
+		$('#heart').text('Heart notes ' + $('#heart_n').val() + '%');
+	});
+	
+	$('#base_n').on('input', function(){
+		$('#base').text('Base notes ' + $('#base_n').val() + '%');
+	});
+	
 });
 
-$('#heart_n').on('input', function(){
-    $('#heart').text('Heart notes ' + $('#heart_n').val() + '%');
-});
-
-$('#base_n').on('input', function(){
-    $('#base').text('Base notes ' + $('#base_n').val() + '%');
-});
 </script>
\ No newline at end of file
diff --git a/pages/views/settings/listCat.php b/pages/views/settings/listCat.php
index 7a0e001d..8df6a623 100644
--- a/pages/views/settings/listCat.php
+++ b/pages/views/settings/listCat.php
@@ -12,7 +12,7 @@
   <div class="text-right">
     <div class="btn-group" id="menu">
         <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mr2"></i>Actions</button>
-        <div class="dropdown-menu dropdown-menu-right">
+        <div class="dropdown-menu">
           <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#add_ingredient_cat"><i class="fa-solid fa-plus mx-2"></i>Add ingredient category</a></li>
           <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#import_categories_json"><i class="fa-solid fa-file-import mx-2"></i>Import from JSON</a></li>
 
@@ -23,7 +23,7 @@
   </div>
 </div>
 <div class="card-body">
-	<table id="tdDataCat" class="table table-striped table-bordered nowrap" style="width:100%">
+	<table id="tdDataCat" class="table table-striped nowrap" style="width:100%">
       <thead>
         <tr>
           <th>Image</th>
@@ -36,7 +36,7 @@
     </table>
 </div>
                 
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function() {
 		var tdDataCat = $('#tdDataCat').DataTable( {
 		columnDefs: [
@@ -50,15 +50,15 @@
 			processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw"></i>',
 			emptyTable: "No categories yet.",
 			search: "Search:"
-			},
+		},
     	ajax: {	url: '/core/list_ingCat_data.php' },
-		 columns: [
-				   { data : 'image', title: 'Image', render: ciImage },
-    			   { data : 'colorKey', title: 'Colour Key', render: ciKey},
-				   { data : 'name', title: 'Name', render: ciName},
-				   { data : 'notes', title: 'Description', render: ciNotes},
-   				   { data : null, title: '', render: ciActions},		   
-				  ],
+		columns: [
+			   { data : 'image', title: 'Image', render: ciImage },
+    		   { data : 'colorKey', title: 'Colour Key', render: ciKey},
+			   { data : 'name', title: 'Name', render: ciName},
+			   { data : 'notes', title: 'Description', render: ciNotes},
+   			   { data : null, title: '', render: ciActions},		   
+		],
         order: [[ 2, 'asc' ]],
 		lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]],
         pageLength: 20,
@@ -87,179 +87,183 @@
 		},
 
 	});
-});
 
-function ciImage(data, type, row){
-	if(row.image){
-		var cimg = '<img src="' + row.image + '" class="img_ing">';
-	}else{
-		var cimg = '<img src="/img/molecule.png" class="img_ing">';
+	function ciImage(data, type, row){
+		if(row.image){
+			var cimg = '<img src="' + row.image + '" class="img_ing">';
+		}else{
+			var cimg = '<img src="/img/molecule.png" class="img_ing">';
+		}
+		
+		return '<a href="#" data-id="'+row.id+'" data-bs-toggle="modal" data-bs-target="#editCategory">' + cimg + '</a>';    
 	}
 	
-	return '<a href="#" data-id="'+row.id+'" data-bs-toggle="modal" data-bs-target="#editCategory">' + cimg + '</a>';    
-}
-
-function ciKey(data, type, row){
-	return '<a href="#" class="colorKey" style="background-color: rgb('+row.colorKey+')" id="colorKey" data-name="colorKey" data-type="select" data-pk="'+row.id+'" data-title="Choose Colour Key for '+row.name+'"></a>';
-};
-
-function ciName(data, type, row){
-	return '<a class="name pv_point_gen" data-name="name" data-type="text" data-pk="'+row.id+'">'+row.name+'</a>';    
-};
-
-function ciNotes(data, type, row){
-	d = row.notes;
-	//if (d.length>255) { d=d.substring(0,255)+'...' };
-	return '<a class="notes pv_point_gen text-wrap-2" data-name="notes" data-type="textarea" data-pk="'+row.id+'">'+d+'</a>';  
-};
-
-function ciActions(data, type, row){
-	return '<i id="catDel" class="pv_point_gen fas fa-trash link-danger" data-id="'+row.id+'" data-name="'+row.name+'"></i>';    
-};
-
-$('#add-category').click(function() {
-$.ajax({ 
-	url: '/pages/update_settings.php', 
-		type: 'POST',
-		data: {
-			manage: 'category',
-			category: $("#category").val(),
-			cat_notes: $("#cat_notes").val(),
+	function ciKey(data, type, row){
+		return '<a href="#" class="colorKey" style="background-color: rgb('+row.colorKey+')" id="colorKey" data-name="colorKey" data-type="select" data-pk="'+row.id+'" data-title="Choose Colour Key for '+row.name+'"></a>';
+	};
+	
+	function ciName(data, type, row){
+		return '<a class="name pv_point_gen" data-name="name" data-type="text" data-pk="'+row.id+'">'+row.name+'</a>';    
+	};
+	
+	function ciNotes(data, type, row){
+		d = row.notes;
+		//if (d.length>255) { d=d.substring(0,255)+'...' };
+		return '<a class="notes pv_point_gen text-wrap-2" data-name="notes" data-type="textarea" data-pk="'+row.id+'">'+d+'</a>';  
+	};
+	
+	function ciActions(data, type, row){
+		return '<i id="catDel" class="pv_point_gen fas fa-trash link-danger" data-id="'+row.id+'" data-name="'+row.name+'"></i>';    
+	};
+	
+	$('#add-category').click(function() {
+	$.ajax({ 
+		url: '/pages/update_settings.php', 
+			type: 'POST',
+			data: {
+				manage: 'category',
+				category: $("#category").val(),
+				cat_notes: $("#cat_notes").val(),
 			},
-		dataType: 'json',
-		success: function (data) {
-			if ( data.success ) {
-            	$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-				$('.toast-header').removeClass().addClass('toast-header alert-success');
-				$('#add_ingredient_cat').modal('toggle');
-				reload_data();
-				$('.toast').toast('show');
-			} else {
-				var msg = '<div class="alert alert-danger">'+data.error+'</div>';
-				$('#catMsgIn').html(msg);
+			dataType: 'json',
+			success: function (data) {
+				if ( data.success ) {
+					$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+					$('.toast-header').removeClass().addClass('toast-header alert-success');
+					$('#add_ingredient_cat').modal('toggle');
+					reload_data();
+					$('.toast').toast('show');
+				} else {
+					var msg = '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mx-2"></i>'+data.error+'</div>';
+					$('#catMsgIn').html(msg);
+				}
+				
 			}
-			
+		});
+	});
+	
+	
+	
+	$('#tdDataCat').editable({
+		container: 'body',
+	  	selector: 'a.name',
+	  	url: "/pages/update_data.php?settings=cat",
+	  	title: 'Category',
+	  	type: "POST",
+	  	dataType: 'json',
+	  	validate: function(value){
+	   		if($.trim(value) == ''){
+				return 'This field is required';
+	   		}
+	  	}
+	});
+	 
+	$('#tdDataCat').editable({
+		container: 'body',
+		selector: 'a.notes',
+		url: "/pages/update_data.php?settings=cat",
+		title: 'Description',
+		type: "POST",
+		dataType: 'json',
+	});
+	
+	//Change colorKey
+	$('#tdDataCat').editable({
+		pvnoresp: false,
+		highlight: false,
+		selector: 'a.colorKey',
+		type: "POST",
+		emptytext: "",
+		emptyclass: "",
+		url: "pages/update_data.php?settings=cat",
+		source: [
+				 <?php
+					$getCK = mysqli_query($conn, "SELECT name,rgb FROM colorKey ORDER BY name ASC");
+					while ($r = mysqli_fetch_array($getCK)){
+					echo '{value: "'.$r['rgb'].'", text: "'.$r['name'].'", ck: "color: rgb('.$r['rgb'].')"},';
+				}
+				?>
+		],
+		dataType: 'html',
+		success: function () {
+			reload_data();
 		}
 	});
-});
-
-
-
-$('#tdDataCat').editable({
-  container: 'body',
-  selector: 'a.name',
-  url: "/pages/update_data.php?settings=cat",
-  title: 'Category',
-  type: "POST",
-  dataType: 'json',
-  validate: function(value){
-   if($.trim(value) == ''){
-    return 'This field is required';
-   }
-  }
-});
- 
-$('#tdDataCat').editable({
-  container: 'body',
-  selector: 'a.notes',
-  url: "/pages/update_data.php?settings=cat",
-  title: 'Description',
-  type: "POST",
-  dataType: 'json',
-});
-
-//Change colorKey
-$('#tdDataCat').editable({
-	pvnoresp: false,
-	highlight: false,
-	selector: 'a.colorKey',
-	type: "POST",
-	emptytext: "",
-	emptyclass: "",
-  	url: "pages/update_data.php?settings=cat",
-    source: [
-			 <?php
-				$getCK = mysqli_query($conn, "SELECT name,rgb FROM colorKey ORDER BY name ASC");
-				while ($r = mysqli_fetch_array($getCK)){
-				echo '{value: "'.$r['rgb'].'", text: "'.$r['name'].'", ck: "color: rgb('.$r['rgb'].')"},';
-			}
-			?>
-          ],
-	dataType: 'html',
-	success: function () {
-		reload_data();
-	}
-});
-
 	
-$('#tdDataCat').on('click', '[id*=catDel]', function () {
-	var cat = {};
-	cat.ID = $(this).attr('data-id');
-	cat.Name = $(this).attr('data-name');
-    
-	bootbox.dialog({
-       title: "Confirm category deletion",
-       message : 'Delete <strong>'+ $(this).attr('data-name') +'</strong> category?',
-       buttons :{
-           main: {
-               label : "Delete",
-               className : "btn-danger",
-               callback: function (){
-	    			
-				$.ajax({ 
-					url: '/pages/update_settings.php', 
-					type: 'POST',
-					data: {
-						action: "delete",
-						catId: cat.ID,
-					},
-					dataType: 'json',
-					success: function (data) {
-						if ( data.success ) {
-							$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-							$('.toast-header').removeClass().addClass('toast-header alert-success');
-							reload_data();
-						} else {
-							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
-							$('.toast-header').removeClass().addClass('toast-header alert-danger');
+		
+	$('#tdDataCat').on('click', '[id*=catDel]', function () {
+		var cat = {};
+		cat.ID = $(this).attr('data-id');
+		cat.Name = $(this).attr('data-name');
+		
+		bootbox.dialog({
+		   title: "Confirm category deletion",
+		   message : 'Delete <strong>'+ $(this).attr('data-name') +'</strong> category?',
+		   buttons :{
+			   main: {
+				   label : "Delete",
+				   className : "btn-danger",
+				   callback: function (){
+						
+					$.ajax({ 
+						url: '/pages/update_settings.php', 
+						type: 'POST',
+						data: {
+							action: "delete",
+							catId: cat.ID,
+						},
+						dataType: 'json',
+						success: function (data) {
+							if ( data.success ) {
+								$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+								$('.toast-header').removeClass().addClass('toast-header alert-success');
+								reload_data();
+							} else {
+								$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
+								$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							}
+							$('.toast').toast('show');
 						}
-						$('.toast').toast('show');
-					}
-				  });
-                 return true;
-               }
-           },
-           cancel: {
-               label : "Cancel",
-               className : "btn-secondary",
-               callback : function() {
-                   return true;
-               }
-           }   
-       },onEscape: function () {return true;}
-   });
-});
-
-function reload_data() {
-    $('#tdDataCat').DataTable().ajax.reload(null, true);
-};
+					  });
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
+	
+	function reload_data() {
+		$('#tdDataCat').DataTable().ajax.reload(null, true);
+	};
+	
+	function extrasShow() {
+		$('[rel=tip]').tooltip({
+			"html": true,
+			"delay": {"show": 100, "hide": 0},
+		 });
+	};
+	
+	$("#editCategory").on("show.bs.modal", function(e) {
+		const id = e.relatedTarget.dataset.id;
+		const name = e.relatedTarget.dataset.name;
+	
+		$.get("/pages/editCat.php?id=" + id)
+			.then(data => {
+			$("#editCategoryLabel", this).html(name);
+			$(".modal-body", this).html(data);
+		});
+	});
 
-function extrasShow() {
-	$('[rel=tip]').tooltip({
-        "html": true,
-        "delay": {"show": 100, "hide": 0},
-     });
-};
-$("#editCategory").on("show.bs.modal", function(e) {
-	const id = e.relatedTarget.dataset.id;
-	const name = e.relatedTarget.dataset.name;
 
-	$.get("/pages/editCat.php?id=" + id)
-		.then(data => {
-		$("#editCategoryLabel", this).html(name);
-		$(".modal-body", this).html(data);
-	});
 });
+
 </script>
 <!--ADD CATEGORY MODAL-->
 <div class="modal fade" id="add_ingredient_cat" data-bs-backdrop="static" tabindex="-1" role="dialog" aria-labelledby="add_ingredient_cat" aria-hidden="true">
@@ -272,12 +276,12 @@ function extrasShow() {
       <div class="modal-body">
         <div id="catMsgIn"></div>
         <div class="form-group">
-              <label class="col-md-3 control-label">Name</label>
-              <div class="col-md-8">
-              	<input type="text" name="category" id="category" class="form-control"/>
-              </div>
-              <label class="col-md-3 control-label">Description</label>
-             <div class="col-md-8">
+        	<div class="mb-3">
+              <label class="form-label">Name</label>
+	          <input type="text" name="category" id="category" class="form-control"/>
+            </div>
+            <div class="mb-3">
+              <label class="form-label">Description</label>
               <input type="text" name="cat_notes" id="cat_notes" class="form-control"/>
     		</div>
 		</div>
diff --git a/pages/views/settings/listFrmCat.php b/pages/views/settings/listFrmCat.php
index d8c65128..ced5a720 100644
--- a/pages/views/settings/listFrmCat.php
+++ b/pages/views/settings/listFrmCat.php
@@ -11,7 +11,7 @@
   <div class="text-right">
     <div class="btn-group" id="menu">
         <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mr2"></i>Actions</button>
-        <div class="dropdown-menu dropdown-menu-right">
+        <div class="dropdown-menu">
           <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#add_formula_cat"><i class="fa-solid fa-plus mx-2"></i>Add formula category</a></li>
           <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#import_categories_json"><i class="fa-solid fa-file-import mx-2"></i>Import from JSON</a></li>
           <li><a class="dropdown-item" href="/pages/operations.php?action=exportFrmCat"><i class="fa-solid fa-file-code mx-2"></i>Export as JSON</a></li>
@@ -21,7 +21,7 @@
 </div>
     <div class="card-body">
     <div id="fcatMsg"></div>
-    <table id="frmDataCat" class="table table-bordered" style="width:100%">
+    <table id="frmDataCat" class="table table-striped" style="width:100%">
       <thead>
         <tr>
           <th>Name</th>
@@ -33,7 +33,7 @@
     </table>
 </div>
  
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function() {
 		var frmDataCat = $('#frmDataCat').DataTable( {
 		columnDefs: [
@@ -79,167 +79,168 @@
 		  });
 		},
 	});
-});
-
-
 
-function cName(data, type, row){
-	return '<a class="name pv_point_gen" data-name="name" data-type="text" data-pk="'+row.id+'">'+row.name+'</a>';    
-}
 
-function cType(data, type, row){
-	return '<a class="type pv_point_gen" data-name="type" data-type="select" data-pk="'+row.id+'">'+row.type+'</a>';    
-}
 
-function cActions(data, type, row){
-	return '<i id="catDel" class="pv_point_gen fas fa-trash link-danger" data-id="'+row.id+'" data-name="'+row.name+'"></i>';    
-}
-
-function fKey(data, type, row){
-	return '<a href="#" class="colorKey" style="background-color: '+row.colorKey+'" id="colorKey" data-name="colorKey" data-type="select" data-pk="'+row.id+'" data-title="Choose Colour Key for '+row.name+'"></a>';    
-}
-
-$('#add-fcat').click(function() {
-$.ajax({ 
-	url: '/pages/update_settings.php', 
-		type: 'POST',
-		data: {
-			manage: 'add_frmcategory',
-			category: $("#fcatName").val(),
-			cat_type: $("#cat_type").val(),
-		},
-		dataType: 'json',
-		success: function (data) {
-			if ( data.success ) {
-				$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-				$('.toast-header').removeClass().addClass('toast-header alert-success');
-				reload_data();
-				$('#add_formula_cat').modal('toggle');
-				$('.toast').toast('show');
-			} else {
-				var msg = '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>'+data.error+'</div>';
-				$('#fcatMsgIn').html(msg);
+	function cName(data, type, row){
+		return '<a class="name pv_point_gen" data-name="name" data-type="text" data-pk="'+row.id+'">'+row.name+'</a>';    
+	}
+	
+	function cType(data, type, row){
+		return '<a class="type pv_point_gen" data-name="type" data-type="select" data-pk="'+row.id+'">'+row.type+'</a>';    
+	}
+	
+	function cActions(data, type, row){
+		return '<i id="catDel" class="pv_point_gen fas fa-trash link-danger" data-id="'+row.id+'" data-name="'+row.name+'"></i>';    
+	}
+	
+	function fKey(data, type, row){
+		return '<a href="#" class="colorKey" style="background-color: '+row.colorKey+'" id="colorKey" data-name="colorKey" data-type="select" data-pk="'+row.id+'" data-title="Choose Colour Key for '+row.name+'"></a>';    
+	}
+	
+	$('#add-fcat').click(function() {
+	$.ajax({ 
+		url: '/pages/update_settings.php', 
+			type: 'POST',
+			data: {
+				manage: 'add_frmcategory',
+				category: $("#fcatName").val(),
+				cat_type: $("#cat_type").val(),
+			},
+			dataType: 'json',
+			success: function (data) {
+				if ( data.success ) {
+					$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+					$('.toast-header').removeClass().addClass('toast-header alert-success');
+					reload_data();
+					$('#add_formula_cat').modal('toggle');
+					$('.toast').toast('show');
+				} else {
+					var msg = '<div class="alert alert-danger"><i class="fa-solid fa-circle-exclamation mr-2"></i>'+data.error+'</div>';
+					$('#fcatMsgIn').html(msg);
+				}
+				
 			}
-			
+		});
+	});
+	
+	
+	
+	$('#frmDataCat').editable({
+	  container: 'body',
+	  selector: 'a.name',
+	  url: "/pages/update_data.php?settings=fcat",
+	  title: 'Category name',
+	  type: "POST",
+	  dataType: 'json',
+	  validate: function(value){
+	   if($.trim(value) == ''){
+		return 'This field is required';
+	   }
+	  }
+	});
+	 
+	
+	//Change type
+	$('#frmDataCat').editable({
+		pvnoresp: false,
+		highlight: false,
+		title: 'Category type',
+		selector: 'a.type',
+		type: "POST",
+		emptytext: "",
+		emptyclass: "",
+		url: "/pages/update_data.php?settings=fcat",
+		source: [
+				 <?php
+					$getCK = mysqli_query($conn, "SELECT type FROM formulaCategories GROUP BY type");
+					while ($r = mysqli_fetch_array($getCK)){
+				 ?>
+					{value: "<?=$r['type']?>", text: "<?=$r['type']?>"},
+				<?php } ?>
+			  ],
+		dataType: 'html',
+		success: function () {
+			reload_data();
 		}
 	});
-});
-
-
-
-$('#frmDataCat').editable({
-  container: 'body',
-  selector: 'a.name',
-  url: "/pages/update_data.php?settings=fcat",
-  title: 'Category name',
-  type: "POST",
-  dataType: 'json',
-  validate: function(value){
-   if($.trim(value) == ''){
-    return 'This field is required';
-   }
-  }
-});
- 
-
-//Change type
-$('#frmDataCat').editable({
-	pvnoresp: false,
-	highlight: false,
-	title: 'Category type',
-	selector: 'a.type',
-	type: "POST",
-	emptytext: "",
-	emptyclass: "",
-  	url: "/pages/update_data.php?settings=fcat",
-    source: [
-			 <?php
-				$getCK = mysqli_query($conn, "SELECT type FROM formulaCategories GROUP BY type");
-				while ($r = mysqli_fetch_array($getCK)){
-			 ?>
-				{value: "<?=$r['type']?>", text: "<?=$r['type']?>"},
-			<?php } ?>
-          ],
-	dataType: 'html',
-	success: function () {
-		reload_data();
-	}
-});
-
-//Change colorKey
-$('#frmDataCat').editable({
-	pvnoresp: false,
-	highlight: false,
-	selector: 'a.colorKey',
-	type: "POST",
-	emptytext: "",
-	emptyclass: "",
-  	url: "/pages/update_data.php?settings=fcat",
-    source: [
-			 <?php
-				$getCK = mysqli_query($conn, "SELECT name,rgb FROM colorKey ORDER BY name ASC");
-				while ($r = mysqli_fetch_array($getCK)){
-				echo '{value: "'.$r['rgb'].'", text: "'.$r['name'].'", ck: "color: rgb('.$r['rgb'].')"},';
-			}
-			?>
-          ],
-	dataType: 'html',
-	success: function () {
-		reload_data();
-	}
-});
 	
-$('#frmDataCat').on('click', '[id*=catDel]', function () {
-	var cat = {};
-	cat.ID = $(this).attr('data-id');
-	cat.Name = $(this).attr('data-name');
-    
-	bootbox.dialog({
-       title: "Confirm category deletion",
-       message : 'Delete <strong>'+ $(this).attr('data-name') +'</strong> category?',
-       buttons :{
-           main: {
-               label : "Delete",
-               className : "btn-danger",
-               callback: function (){
-	    			
-				$.ajax({ 
-					url: '/pages/update_settings.php', 
-					type: 'POST',
-					data: {
-						action: "del_frmcategory",
-						catId: cat.ID,
-					},
-					dataType: 'json',
-					success: function (data) {
-						if ( data.success ) {
-							$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
-							$('.toast-header').removeClass().addClass('toast-header alert-success');
-							reload_data();
-						} else {
-							$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
-							$('.toast-header').removeClass().addClass('toast-header alert-danger');
+	//Change colorKey
+	$('#frmDataCat').editable({
+		pvnoresp: false,
+		highlight: false,
+		selector: 'a.colorKey',
+		type: "POST",
+		emptytext: "",
+		emptyclass: "",
+		url: "/pages/update_data.php?settings=fcat",
+		source: [
+				 <?php
+					$getCK = mysqli_query($conn, "SELECT name,rgb FROM colorKey ORDER BY name ASC");
+					while ($r = mysqli_fetch_array($getCK)){
+					echo '{value: "'.$r['rgb'].'", text: "'.$r['name'].'", ck: "color: rgb('.$r['rgb'].')"},';
+				}
+				?>
+			  ],
+		dataType: 'html',
+		success: function () {
+			reload_data();
+		}
+	});
+		
+	$('#frmDataCat').on('click', '[id*=catDel]', function () {
+		var cat = {};
+		cat.ID = $(this).attr('data-id');
+		cat.Name = $(this).attr('data-name');
+		
+		bootbox.dialog({
+		   title: "Confirm category deletion",
+		   message : 'Delete <strong>'+ $(this).attr('data-name') +'</strong> category?',
+		   buttons :{
+			   main: {
+				   label : "Delete",
+				   className : "btn-danger",
+				   callback: function (){
+						
+					$.ajax({ 
+						url: '/pages/update_settings.php', 
+						type: 'POST',
+						data: {
+							action: "del_frmcategory",
+							catId: cat.ID,
+						},
+						dataType: 'json',
+						success: function (data) {
+							if ( data.success ) {
+								$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+								$('.toast-header').removeClass().addClass('toast-header alert-success');
+								reload_data();
+							} else {
+								$('#toast-title').html('<i class="fa-solid fa-circle-exclamation mr-2"></i>' + data.error);
+								$('.toast-header').removeClass().addClass('toast-header alert-danger');
+							}
+							$('.toast').toast('show');
 						}
-						$('.toast').toast('show');
-					}
-				  });
-                 return true;
-               }
-           },
-           cancel: {
-               label : "Cancel",
-               className : "btn-secondary",
-               callback : function() {
-                   return true;
-               }
-           }   
-       },onEscape: function () {return true;}
-   });
-});
+					  });
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
+	
+	function reload_data() {
+		$('#frmDataCat').DataTable().ajax.reload(null, true);
+	};
 
-function reload_data() {
-    $('#frmDataCat').DataTable().ajax.reload(null, true);
-};
+});
 
 
 </script>
diff --git a/pages/views/settings/perfume_types.php b/pages/views/settings/perfume_types.php
index e18f8df0..5e022929 100644
--- a/pages/views/settings/perfume_types.php
+++ b/pages/views/settings/perfume_types.php
@@ -9,15 +9,15 @@
 <div class="card-body">
   <div class="text-right">
     <div class="btn-group">
-    <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mr2"></i>Actions</button>
-        <div class="dropdown-menu dropdown-menu-right">
+    <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
+        <div class="dropdown-menu">
             <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#addpType"><i class="fa-solid fa-plus mx-2"></i>Add new</a></li>
           <li><a class="dropdown-item" href="/pages/operations.php?action=exportPerfTypes"><i class="fa-solid fa-file-code mx-2"></i>Export as JSON</a></li>
         </div>
     </div>                    
   </div>
 </div>
-<table id="tdperfTypes" class="table table-striped table-bordered" style="width:100%">
+<table id="tdperfTypes" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Name</th>
@@ -27,192 +27,194 @@
       </tr>
    </thead>
 </table>
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function() {
 		
 	$('[data-bs-toggle="tooltip"]').tooltip();
 	var tdperfTypes = $('#tdperfTypes').DataTable( {
-	columnDefs: [
-		{ className: 'text-center', targets: '_all' },
-		{ orderable: false, targets: [3] }
-	],
-	dom: 'lfrtip',
-	processing: true,
-	language: {
-		loadingRecords: '&nbsp;',
-		processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw"></i><span class="sr-only">Loading...</span>',
-		emptyTable: 'No perfume types found.',
-		search: 'Search:'
+		columnDefs: [
+			{ className: 'text-center', targets: '_all' },
+			{ orderable: false, targets: [3] }
+		],
+		dom: 'lfrtip',
+		processing: true,
+		language: {
+			loadingRecords: '&nbsp;',
+			processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw"></i><span class="sr-only">Loading...</span>',
+			emptyTable: 'No perfume types found.',
+			search: 'Search:'
+			},
+		ajax: {	url: '/core/list_perfume_types_data.php' },
+		columns: [
+				  { data : 'name', title: 'Name', render: name },
+				  { data : 'concentration', title: 'Concentration', render: concentration},
+				  { data : 'description', title: 'Description', render: description},
+				  { data : null, title: '', render: actions},		   
+		],
+		order: [[ 1, 'asc' ]],
+		lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]],
+		pageLength: 20,
+		displayLength: 20,
+		stateSave: true,
+		stateDuration: -1,
+		stateLoadCallback: function (settings, callback) {
+			$.ajax( {
+				url: '/core/update_user_settings.php?set=listPerfTypes&action=load',
+				dataType: 'json',
+				success: function (json) {
+					callback( json );
+				}
+			});
+		},
+		stateSaveCallback: function (settings, data) {
+		   $.ajax({
+			 url: "/core/update_user_settings.php?set=listPerfTypes&action=save",
+			 data: data,
+			 dataType: "json",
+			 type: "POST"
+		  });
 		},
-	ajax: {	url: '/core/list_perfume_types_data.php' },
-	columns: [
-			  { data : 'name', title: 'Name', render: name },
-			  { data : 'concentration', title: 'Concentration', render: concentration},
-			  { data : 'description', title: 'Description', render: description},
-			  { data : null, title: 'Actions', render: actions},		   
-			 ],
-	order: [[ 1, 'asc' ]],
-	lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]],
-	pageLength: 20,
-	displayLength: 20,
-	stateSave: true,
-	stateDuration: -1,
-	stateLoadCallback: function (settings, callback) {
-       	$.ajax( {
-           	url: '/core/update_user_settings.php?set=listPerfTypes&action=load',
-           	dataType: 'json',
-           	success: function (json) {
-               	callback( json );
-           	}
-       	});
-    },
-    stateSaveCallback: function (settings, data) {
-	   $.ajax({
-		 url: "/core/update_user_settings.php?set=listPerfTypes&action=save",
-		 data: data,
-		 dataType: "json",
-		 type: "POST"
-	  });
-	},
 	});
-});
-
-function name(data, type, row){
-	return '<a href="#" class="name pv_point_gen" data-name="name" data-type="text" data-pk="'+row.id+'">'+row.name+'</a>';
-};
-
 
-function concentration(data, type, row){
-	return '<a href="#" class="concentration pv_point_gen" data-name="concentration" data-type="text" data-pk="'+row.id+'">'+row.concentration+'</a>';    
-};
-
-function description(data, type, row){
-	return '<a href="#" class="description pv_point_gen" data-name="description" data-type="textarea" data-pk="'+row.id+'">'+row.description+'</a>';    
-};
-
-function actions(data, type, row){
-	return '<a href="#" id="sDel" class="fas fa-trash link-danger" data-id="'+row.id+'" data-name="'+row.name+'"></a>';
-};
-
-
-$('#tdperfTypes').editable({
-	  container: 'body',
-	  selector: 'a.name',
-	  type: 'POST',
-	  url: "/pages/update_data.php?perfType=update",
-	  title: 'Perfume type name',
-	  success: function (data) {
-			reload_data();
-	  },
+	function name(data, type, row){
+		return '<a href="#" class="name pv_point_gen" data-name="name" data-type="text" data-pk="'+row.id+'">'+row.name+'</a>';
+	};
 	
-	 validate: function(value){
-   		if($.trim(value) == ''){
-			return 'This field is required';
-   		}
-	 }
-});
-  
-$('#tdperfTypes').editable({
-	  container: 'body',
-	  selector: 'a.concentration',
-	  type: 'POST',
-	  url: "/pages/update_data.php?perfType=update",
-	  title: 'Concentration in %',
-	  success: function (data) {
-			reload_data();
-	},
 	
-	validate: function(value){
-   		if($.trim(value) == ''){
-			return 'This field is required';
-   		}
-	   	if($.isNumeric(value) == '' ){
-			return 'Numbers only allowed';
-   		}
-	}
-});
+	function concentration(data, type, row){
+		return '<a href="#" class="concentration pv_point_gen" data-name="concentration" data-type="text" data-pk="'+row.id+'">'+row.concentration+'</a>';    
+	};
 	
-$('#tdperfTypes').editable({
-  	container: 'body',
-  	selector: 'a.description',
-  	type: 'POST',
-	url: "/pages/update_data.php?perfType=update",
-	title: 'Short description',
-	success: function (data) {
-			reload_data();
-	},
-});
- 
-
+	function description(data, type, row){
+		return '<a href="#" class="description pv_point_gen" data-name="description" data-type="textarea" data-pk="'+row.id+'">'+row.description+'</a>';    
+	};
 	
-$('#tdperfTypes').on('click', '[id*=sDel]', function () {
-	var pType = {};
-	pType.ID = $(this).attr('data-id');
-	pType.Name = $(this).attr('data-name');
-    
-	bootbox.dialog({
-       title: "Confirm perfume type removal",
-       message : 'Delete <strong>'+ pType.Name +'</strong>?',
-       buttons :{
-           main: {
-               label : "Remove",
-               className : "btn-danger",
-               callback: function (){
-	    			
-				$.ajax({ 
-					url: '/pages/update_data.php', 
-					type: 'POST',
-					data: {
-						perfType: 'delete',
-						pID: pType.ID,
-						pName: pType.Name
-						},
-					dataType: 'json',
-					success: function (data) {
-						reload_data();
-					}
-				  });
-				
-                 return true;
-               }
-           },
-           cancel: {
-               label : "Cancel",
-               className : "btn-secondary",
-               callback : function() {
-                   return true;
-               }
-           }   
-       },onEscape: function () {return true;}
-   });
-});
-
-$('#addpType').on('click', '[id*=sAdd]', function () {
-	$.ajax({ 
-		url: '/pages/update_data.php', 
+	function actions(data, type, row){
+		return '<a href="#" id="sDel" class="fas fa-trash link-danger" data-id="'+row.id+'" data-name="'+row.name+'"></a>';
+	};
+	
+	
+	$('#tdperfTypes').editable({
+		  container: 'body',
+		  selector: 'a.name',
+		  type: 'POST',
+		  url: "/pages/update_data.php?perfType=update",
+		  title: 'Perfume type name',
+		  success: function (data) {
+				reload_data();
+		  },
+		
+		 validate: function(value){
+			if($.trim(value) == ''){
+				return 'This field is required';
+			}
+		 }
+	});
+	  
+	$('#tdperfTypes').editable({
+		  container: 'body',
+		  selector: 'a.concentration',
+		  type: 'POST',
+		  url: "/pages/update_data.php?perfType=update",
+		  title: 'Concentration in %',
+		  success: function (data) {
+				reload_data();
+		},
+		
+		validate: function(value){
+			if($.trim(value) == ''){
+				return 'This field is required';
+			}
+			if($.isNumeric(value) == '' ){
+				return 'Numbers only allowed';
+			}
+		}
+	});
+		
+	$('#tdperfTypes').editable({
+		container: 'body',
+		selector: 'a.description',
 		type: 'POST',
-		data: {
-			perfType: 'add',
-			perfType_name: $("#perfType_name").val(),
-			perfType_conc: $("#perfType_conc").val(),
-			perfType_desc: $("#perfType_desc").val(),	
-			},
-		dataType: 'json',
+		url: "/pages/update_data.php?perfType=update",
+		title: 'Short description',
 		success: function (data) {
-			if(data.success){
-				var msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.success + '</div>';
-			}else{
-				var msg ='<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.error + '</div>';
+				reload_data();
+		},
+	});
+	 
+	
+		
+	$('#tdperfTypes').on('click', '[id*=sDel]', function () {
+		var pType = {};
+		pType.ID = $(this).attr('data-id');
+		pType.Name = $(this).attr('data-name');
+		
+		bootbox.dialog({
+		   title: "Confirm perfume type removal",
+		   message : 'Delete <strong>'+ pType.Name +'</strong>?',
+		   buttons :{
+			   main: {
+				   label : "Remove",
+				   className : "btn-danger",
+				   callback: function (){
+						
+					$.ajax({ 
+						url: '/pages/update_data.php', 
+						type: 'POST',
+						data: {
+							perfType: 'delete',
+							pID: pType.ID,
+							pName: pType.Name
+							},
+						dataType: 'json',
+						success: function (data) {
+							reload_data();
+						}
+					  });
+					
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
+	
+	$('#addpType').on('click', '[id*=sAdd]', function () {
+		$.ajax({ 
+			url: '/pages/update_data.php', 
+			type: 'POST',
+			data: {
+				perfType: 'add',
+				perfType_name: $("#perfType_name").val(),
+				perfType_conc: $("#perfType_conc").val(),
+				perfType_desc: $("#perfType_desc").val(),	
+			},
+			dataType: 'json',
+			success: function (data) {
+				if(data.success){
+					var msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><i class="fa-solid fa-check mx-2"></i>' + data.success + '</div>';
+				}else{
+					var msg ='<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><i class="fa-solid fa-triangle-exclamation mx-2"></i>' + data.error + '</div>';
+				}
+				$('#ptype_inf').html(msg);
+				reload_data();
 			}
-			$('#ptype_inf').html(msg);
-			reload_data();
-		}
-	  });
+		  });
+	});
+	
+	function reload_data() {
+		$('#tdperfTypes').DataTable().ajax.reload(null, true);
+	};
+
 });
 
-function reload_data() {
-    $('#tdperfTypes').DataTable().ajax.reload(null, true);
-};
 </script>
 
 <!-- ADD PERFUME TYPE-->
diff --git a/pages/views/settings/sds.php b/pages/views/settings/sds.php
index f2d9678d..29663ce4 100644
--- a/pages/views/settings/sds.php
+++ b/pages/views/settings/sds.php
@@ -11,23 +11,15 @@
 <h3>SDS Settings</h3>
 <hr>
 <div class="card-body">
-		<div class="mb-3">
-  			<label for="sds_disc_content" class="form-label">SDS Disclaimer</label>
-            <textarea class="form-control" name="sds_disc_content" id="sds_disc_content" rows="4"><?=$settings['sds_disclaimer']?>
-            </textarea>
-		</div>
-  
-      </div>
-      <input type="submit" name="button" class="btn btn-primary" id="sds_set_update" value="Save">
+	<div class="mb-3">
+  		<label for="sds_disc_content" class="form-label">SDS Disclaimer</label>
+        <textarea class="form-control" name="sds_disc_content" id="sds_disc_content" rows="4"><?=$settings['sds_disclaimer']?></textarea>
+	</div>
+	<input type="submit" name="button" class="btn btn-primary" id="sds_set_update" value="Save">
 </div>
 
 <script>
 $(document).ready(function() {
-		
-
-  
-
-
 
 $('#sds_set_update').click(function() {
 
@@ -41,10 +33,10 @@
 		dataType: 'json',
 		success: function (data) {
 			if(data.success){
-				$('#toast-title').html('<i class="fa-solid fa-circle-check mr-2"></i>' + data.success);
+				$('#toast-title').html('<i class="fa-solid fa-circle-check mx-2"></i>' + data.success);
 				$('.toast-header').removeClass().addClass('toast-header alert-success');
 			} else if(data.error) {
-				$('#toast-title').html('<i class="fa-solid fa-warning mr-2"></i>' + data.error);
+				$('#toast-title').html('<i class="fa-solid fa-warning mx-2"></i>' + data.error);
 				$('.toast-header').removeClass().addClass('toast-header alert-danger');
 			}
 			$('.toast').toast('show');
diff --git a/pages/views/settings/templates.php b/pages/views/settings/templates.php
index 099a5e26..eeb698a7 100644
--- a/pages/views/settings/templates.php
+++ b/pages/views/settings/templates.php
@@ -10,14 +10,14 @@
 <div class="card-body">
   <div class="text-right">
     <div class="btn-group">
-    <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mr2"></i>Actions</button>
-        <div class="dropdown-menu dropdown-menu-right">
-            <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#addTmpl"><i class="fa-solid fa-plus mx-2"></i>Add new</a></li>
+    <button type="button" class="btn btn-primary dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fa fa-bars mx-2"></i>Actions</button>
+        <div class="dropdown-menu">
+            <li><a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#addTmpl"><i class="fa-solid fa-plus mx-2"></i>Add new template</a></li>
         </div>
     </div>                    
   </div>
 </div>
-<table id="tdTempls" class="table table-striped table-bordered" style="width:100%">
+<table id="tdTempls" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Name</th>
@@ -28,210 +28,212 @@
       </tr>
    </thead>
 </table>
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function() {
 		
 	var tdTempls = $('#tdTempls').DataTable( {
-	columnDefs: [
-		{ className: 'text-center', targets: '_all' },
-		{ orderable: false, targets: [4] }
-	],
-	dom: 'lfrtip',
-	processing: true,
-	language: {
-		loadingRecords: '&nbsp;',
-		processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw"></i><span class="sr-only">Loading...</span>',
-		emptyTable: 'No templates found.',
-		search: 'Search:'
+		columnDefs: [
+			{ className: 'text-center', targets: '_all' },
+			{ orderable: false, targets: [4] }
+		],
+		dom: 'lfrtip',
+		processing: true,
+		language: {
+			loadingRecords: '&nbsp;',
+			processing: '<i class="fa fa-spinner fa-spin fa-3x fa-fw"></i><span class="sr-only">Loading...</span>',
+			emptyTable: 'No templates found.',
+			search: 'Search:'
+			},
+		ajax: {	url: '/core/list_templates_data.php' },
+		columns: [
+				  { data : 'name', title: 'Name', render: name },
+				  { data : 'description', title: 'Description', render: description},
+				  { data : 'created', title: 'Created', render: created},
+				  { data : 'updated', title: 'Updated', render: updated},
+				  { data : null, title: '', render: actions},		   
+		],
+		order: [[ 1, 'asc' ]],
+		lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]],
+		pageLength: 20,
+		displayLength: 20,
+		drawCallback: function( settings ) {
+				extrasShow();
+		},
+		stateSave: true,
+		stateDuration: -1,
+		stateLoadCallback: function (settings, callback) {
+			$.ajax( {
+				url: '/core/update_user_settings.php?set=listHTMLTmpl&action=load',
+				dataType: 'json',
+				success: function (json) {
+					callback( json );
+				}
+			});
 		},
-	ajax: {	url: '/core/list_templates_data.php' },
-	columns: [
-			  { data : 'name', title: 'Name', render: name },
-			  { data : 'description', title: 'Description', render: description},
-			  { data : 'created', title: 'Created', render: created},
-			  { data : 'updated', title: 'Updated', render: updated},
-			  { data : null, title: '', render: actions},		   
-			 ],
-	order: [[ 1, 'asc' ]],
-	lengthMenu: [[20, 50, 100, -1], [20, 50, 100, "All"]],
-	pageLength: 20,
-	displayLength: 20,
-	drawCallback: function( settings ) {
-			extrasShow();
-     	},
-	stateSave: true,
-	stateDuration: -1,
-	stateLoadCallback: function (settings, callback) {
-       	$.ajax( {
-           	url: '/core/update_user_settings.php?set=listHTMLTmpl&action=load',
-           	dataType: 'json',
-           	success: function (json) {
-               	callback( json );
-           	}
-       	});
-    },
-    stateSaveCallback: function (settings, data) {
-	   $.ajax({
-		 url: "/core/update_user_settings.php?set=listHTMLTmpl&action=save",
-		 data: data,
-		 dataType: "json",
-		 type: "POST"
-	  });
-	},	
+		stateSaveCallback: function (settings, data) {
+		   $.ajax({
+			 url: "/core/update_user_settings.php?set=listHTMLTmpl&action=save",
+			 data: data,
+			 dataType: "json",
+			 type: "POST"
+		  });
+		},	
 	});
 	
-});
-
-function name(data, type, row){
-	return '<a href="#" class="name pv_point_gen" data-name="name" data-type="text" data-pk="'+row.id+'">'+row.name+'</a>';    
-}
-
-function description(data, type, row){
-	return '<a href="#" class="description pv_point_gen" data-name="description" data-type="textarea" data-pk="'+row.id+'">'+row.description+'</a>';    
-}
-
-function created(data, type, row){
-	return row.created;    
-}
-
-function updated(data, type, row){
-	return row.updated;    
-}
-
-function actions(data, type, row){	
-		data = '<div class="dropdown">' +
-        '<button type="button" class="btn btn-primary btn-floating dropdown-toggle hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
-            '<ul class="dropdown-menu dropdown-menu-right">';
-		data += '<li><a href="#" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#editTmpl" rel="tip" title="Edit '+ row.name +'" data-id='+ row.id +' data-name="'+ row.name +'"><i class="fas fa-edit mr2"></i>Edit</a></li>';
-		data += '<div class="dropdown-divider"></div>';
-		data += '<li><a class="dropdown-item text-danger" href="#" id="sDel" rel="tip" title="Delete '+ row.name +'" data-id='+ row.id +' data-name="'+ row.name +'"><i class="fas fa-trash mr2"></i>Delete</a></li>';
-		data += '</ul></div>';
-	return data;
-}
-
-
-$('#tdTempls').editable({
-	  container: 'body',
-	  selector: 'a.name',
-	  type: 'POST',
-	  url: "/pages/update_data.php?tmpl=update",
-	  title: 'Template name',
-	  success: function (data) {
-		reload_data();
-	  },
-  	  validate: function(value){
-   		if($.trim(value) == ''){
-			return 'This field is required';
-   		}
-	 }
-});
-  
-
-$('#tdTempls').editable({
-  	container: 'body',
-  	selector: 'a.description',
-  	type: 'POST',
-	url: "/pages/update_data.php?tmpl=update",
-	title: 'Short description',
-	success: function (data) {
-		reload_data();
-	},
-	validate: function(value){
-   		if($.trim(value) == ''){
-			return 'This field is required';
-   		}
-	 }
-});
- 
 
-$('#tdTempls').on('click', '[id*=sDel]', function () {
-	var tmpl = {};
-	tmpl.ID = $(this).attr('data-id');
-	tmpl.Name = $(this).attr('data-name');
-    
-	bootbox.dialog({
-       title: "Confirm template removal",
-       message : 'Delete <strong>'+ tmpl.Name +'</strong>?',
-       buttons :{
-           main: {
-               label : "Remove",
-               className : "btn-danger",
-               callback: function (){
-	    			
-				$.ajax({ 
-					url: '/pages/update_data.php', 
-					type: 'POST',
-					data: {
-						tmpl: 'delete',
-						tmplID: tmpl.ID,
-						tmplName: tmpl.Name
-						},
-					dataType: 'json',
-					success: function (data) {
-						reload_data();
-					}
-				  });
-				
-                 return true;
-               }
-           },
-           cancel: {
-               label : "Cancel",
-               className : "btn-secondary",
-               callback : function() {
-                   return true;
-               }
-           }   
-       },onEscape: function () {return true;}
-   });
-});
 
-$('#addTmpl').on('click', '[id*=sAdd]', function () {
-	$.ajax({ 
-		url: '/pages/update_data.php', 
+	function name(data, type, row){
+		return '<a href="#" class="name pv_point_gen" data-name="name" data-type="text" data-pk="'+row.id+'">'+row.name+'</a>';    
+	}
+	
+	function description(data, type, row){
+		return '<a href="#" class="description pv_point_gen" data-name="description" data-type="textarea" data-pk="'+row.id+'">'+row.description+'</a>';    
+	}
+	
+	function created(data, type, row){
+		return row.created;    
+	}
+	
+	function updated(data, type, row){
+		return row.updated;    
+	}
+	
+	function actions(data, type, row){	
+			data = '<div class="dropdown">' +
+			'<button type="button" class="btn btn-floating hidden-arrow" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="fas fa-ellipsis-v"></i></button>' +
+				'<ul class="dropdown-menu">';
+			data += '<li><a href="#" class="dropdown-item" data-bs-toggle="modal" data-bs-target="#editTmpl" rel="tip" title="Edit '+ row.name +'" data-id='+ row.id +' data-name="'+ row.name +'"><i class="fas fa-edit mx-2"></i>Edit</a></li>';
+			data += '<div class="dropdown-divider"></div>';
+			data += '<li><a class="dropdown-item text-danger" href="#" id="sDel" rel="tip" title="Delete '+ row.name +'" data-id='+ row.id +' data-name="'+ row.name +'"><i class="fas fa-trash mx-2"></i>Delete</a></li>';
+			data += '</ul></div>';
+		return data;
+	}
+	
+	
+	$('#tdTempls').editable({
+		  container: 'body',
+		  selector: 'a.name',
+		  type: 'POST',
+		  url: "/pages/update_data.php?tmpl=update",
+		  title: 'Template name',
+		  success: function (data) {
+			reload_data();
+		  },
+		  validate: function(value){
+			if($.trim(value) == ''){
+				return 'This field is required';
+			}
+		 }
+	});
+	  
+	
+	$('#tdTempls').editable({
+		container: 'body',
+		selector: 'a.description',
 		type: 'POST',
-		data: {
-			tmpl: 'add',
-			tmpl_name: $("#tmpl_name").val(),
-			tmpl_content: $("#tmpl_content").val(),
-			tmpl_desc: $("#tmpl_desc").val(),	
-			},
-		dataType: 'json',
+		url: "/pages/update_data.php?tmpl=update",
+		title: 'Short description',
 		success: function (data) {
-			if(data.success){
-				var msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.success + '</div>';
-			}else{
-				var msg ='<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.error + '</div>';
-			}
-			$('#tmpl_inf').html(msg);
 			reload_data();
-		}
-	  });
-});
-
-function reload_data() {
-    $('#tdTempls').DataTable().ajax.reload(null, true);
-};
-
-function extrasShow() {
-	$('[rel=tip]').tooltip({
-         html: true,
-		 boundary: "window",
-		 overflow: "auto",
-		 container: "body",
-         delay: {"show": 100, "hide": 0},
-     });
-};
-
-$("#editTmpl").on("show.bs.modal", function(e) {
-	const id = e.relatedTarget.dataset.id;
-	const name = e.relatedTarget.dataset.name;
-
-	$.get("/pages/editHtmlTmpl.php?id=" + id)
-		.then(data => {
-		$("#editTmplLabel", this).html(name);
-		$(".modal-body", this).html(data);
+		},
+		validate: function(value){
+			if($.trim(value) == ''){
+				return 'This field is required';
+			}
+		 }
 	});
+	 
+	
+	$('#tdTempls').on('click', '[id*=sDel]', function () {
+		var tmpl = {};
+		tmpl.ID = $(this).attr('data-id');
+		tmpl.Name = $(this).attr('data-name');
+		
+		bootbox.dialog({
+		   title: "Confirm template removal",
+		   message : 'Delete <strong>'+ tmpl.Name +'</strong>?',
+		   buttons :{
+			   main: {
+				   label : "Remove",
+				   className : "btn-danger",
+				   callback: function (){
+						
+					$.ajax({ 
+						url: '/pages/update_data.php', 
+						type: 'POST',
+						data: {
+							tmpl: 'delete',
+							tmplID: tmpl.ID,
+							tmplName: tmpl.Name
+						},
+						dataType: 'json',
+						success: function (data) {
+							reload_data();
+						}
+					  });
+					
+					 return true;
+				   }
+			   },
+			   cancel: {
+				   label : "Cancel",
+				   className : "btn-secondary",
+				   callback : function() {
+					   return true;
+				   }
+			   }   
+		   },onEscape: function () {return true;}
+	   });
+	});
+	
+	$('#addTmpl').on('click', '[id*=sAdd]', function () {
+		$.ajax({ 
+			url: '/pages/update_data.php', 
+			type: 'POST',
+			data: {
+				tmpl: 'add',
+				tmpl_name: $("#tmpl_name").val(),
+				tmpl_content: $("#tmpl_content").val(),
+				tmpl_desc: $("#tmpl_desc").val(),	
+				},
+			dataType: 'json',
+			success: function (data) {
+				if(data.success){
+					var msg = '<div class="alert alert-success alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a>' + data.success + '</div>';
+				}else{
+					var msg ='<div class="alert alert-danger alert-dismissible"><a href="#" class="close" data-bs-dismiss="alert" aria-label="close">x</a><i class="fa-solid fa-triangle-exclamation mx-2"></i>' + data.error + '</div>';
+				}
+				$('#tmpl_inf').html(msg);
+				reload_data();
+			}
+		  });
+	});
+	
+	function reload_data() {
+		$('#tdTempls').DataTable().ajax.reload(null, true);
+	};
+	
+	function extrasShow() {
+		$('[rel=tip]').tooltip({
+			 html: true,
+			 boundary: "window",
+			 overflow: "auto",
+			 container: "body",
+			 delay: {"show": 100, "hide": 0},
+		 });
+	};
+	
+	$("#editTmpl").on("show.bs.modal", function(e) {
+		const id = e.relatedTarget.dataset.id;
+		const name = e.relatedTarget.dataset.name;
+	
+		$.get("/pages/editHtmlTmpl.php?id=" + id)
+			.then(data => {
+			$("#editTmplLabel", this).html(name);
+			$(".modal-body", this).html(data);
+		});
+	});
+
 });
 </script>
 
diff --git a/pages/views/stats/inventoryWorth.php b/pages/views/stats/inventoryWorth.php
index aefb8a75..366c1fc8 100644
--- a/pages/views/stats/inventoryWorth.php
+++ b/pages/views/stats/inventoryWorth.php
@@ -6,7 +6,7 @@
 ?>
 <h3>Inventory Worth</h3>
 <hr>
-<table id="tdInvWorth" class="table table-striped table-bordered" style="width:100%">
+<table id="tdInvWorth" class="table table-striped" style="width:100%">
   <thead>
       <tr>
           <th>Type</th>
@@ -14,7 +14,7 @@
       </tr>
    </thead>
 </table>
-<script type="text/javascript" language="javascript" >
+<script>
 $(document).ready(function() {
 		
 	var tdInvWorth = $('#tdInvWorth').DataTable( {
@@ -37,17 +37,17 @@
 			  { data : 'worth', title: 'Worth', render: worth},
 			 ],
 	});
-});
-
-function type(data, type, row){
-	return "Ingredients";    
-}
 
 
-function worth(data, type, row){
-	return row.currency + row.ingredients.total_worth;    
-}
-
+	function type(data, type, row){
+		return "Ingredients";    
+	}
+	
+	
+	function worth(data, type, row){
+		return row.currency + row.ingredients.total_worth;    
+	}
 
+});
 </script>
 
diff --git a/releasenotes.md b/releasenotes.md
index 95cc9252..4941034a 100755
--- a/releasenotes.md
+++ b/releasenotes.md
@@ -1,10 +1,11 @@
-Whats New in v10.7
+Whats New in v10.8
 --------------------------
-- Removed ingredient purity and dilutant from Finished Product page for cleaner view
-- Moved IFRA doc to a modal window
-- Added a print button for the generated IFRA Doc
-- Fix IFRA Document failing to be generated
-- Added a pending materials page to list all pending materials and their quantity required for the pending formulas
-- Choose which supplier you updating the stock when making a formula
-- Show available stock from all the available suppliers when making a formula, instead of the preferred one only
+- This release also contains various UI and backend minor improvements
+- Added support for a dark theme
+- Complete rewrite for Finished Product page
+- Added a font size when exporting a PDF in Sell Formula
+- Added brand logo when exporting a PDF in Sell Formula
+- Added opacity for watermak in Sell Formula page
+- Replaced PDF export in Sell Formula with the native DataTables function
+- Under the hood improvements for Finished Product page
 - This release may include more changes, for full details please refer to the CHANGELOG