diff --git a/gui/index.html b/gui/index.html
index 6df8c4a..399a1aa 100644
--- a/gui/index.html
+++ b/gui/index.html
@@ -470,7 +470,7 @@
                 </div>
                 <div class="input-group col-sm-12">
                   <select class="selectpicker trading_pair_coin" data-live-search="true" data-hide-disabled="true" data-width="30%"></select>
-                  <input type="text" class="form-control trading_pair_coin_price" placeholder="Price e.g. 0.01" style="height: 64px; font-size: 20px;">
+                  <input type="number" class="form-control trading_pair_coin_price" placeholder="Price e.g. 0.01" style="height: 64px; font-size: 20px;">
                   <span class="input-group-addon" id="trading_pair_coin_price_max_min" style="font-size: 20px;">Max</span>
                 </div>
                 <div class="form-group" style="margin-top: 15px; margin-bottom: 0px;">
@@ -478,7 +478,7 @@
                 </div>
                 <div class="input-group col-sm-12">
                   <span class="input-group-addon coin_ticker" id="trading_pair_coin_ticker" style="font-size: 20px;"></span>
-                  <input type="text" class="form-control trading_pair_coin_volume" placeholder="Amount e.g. 12.5" style="height: 64px; font-size: 20px;">
+                  <input type="number" class="form-control trading_pair_coin_volume" placeholder="Amount e.g. 12.5" style="height: 64px; font-size: 20px;">
                   <span class="input-group-btn">
                     <button class="btn btn-primary btn-bot_action" data-action="buy" style="height: 64px; font-size: 20px;">BUY</button>
                   </span>
@@ -490,14 +490,16 @@
         </div>
       </div>
 
-      <div class="col-sm-6" style="display: none;">
+      <div class="col-sm-6">
         <div class="panel panel-default">
           <div class="panel-heading">
-            <h3 class="panel-title"><strong>Trading Bot</strong></h3>
-            
+            <h3 class="panel-title"><strong>Your Balance</strong></h3>
           </div>
           <div class=""> <!-- panel-body -->
-            
+            <div class="input-group col-sm-12">
+              <span class="input-group-addon coin_ticker trading_coin_ticker_name" style="font-size: 20px;"></span>
+              <span class="input-group-addon trading_coin_balance"></span>
+            </div>
           </div>
         </div>
       </div>
@@ -534,7 +536,12 @@
 
                         <table class="table table-striped exchange_bot_list_tbl" width="100%" style="margin-bottom: 0;">
                           <thead>
-                            <th>Auto Trader ID</th>
+                            <!--<th>Bot ID</th>-->
+                            <th>Name</th>
+                            <th>Bot Action</th>
+                            <th>Price</th>
+                            <th>Max Volume</th>
+                            <th>Trades Done</th>
                             <th>Actions</th>
                           </thead>
                           <tbody></tbody>
@@ -1083,6 +1090,7 @@
     <script src="js/bootbox.min.js" type="text/javascript"></script>
     <script src="js/clipboard.min.js" type="text/javascript"></script>
     <script src="js/bootstrap-slider.min.js" type="text/javascript"></script>
+    <script src="js/number-polyfill.min.js" type="text/javascript"></script>
     <!-- amcharts libs -->
     <script src="js/amcharts/amcharts.js" type="text/javascript"></script>
     <script src="js/amcharts/pie.js" type="text/javascript"></script>
diff --git a/gui/js/number-polyfill.min.js b/gui/js/number-polyfill.min.js
new file mode 100644
index 0000000..b5cea8b
--- /dev/null
+++ b/gui/js/number-polyfill.min.js
@@ -0,0 +1 @@
+(function(){(function(e){var t,n;return t=document.createElement("input"),t.setAttribute("type","number"),"text"!==t.type?(e.fn.inputNumber=function(){return e(this)},void 0):(e.fn.inputNumber=function(){return e(this).filter(function(){var t;return t=e(this),t.is('input[type="number"]')&&!(t.parent().is("span")&&t.next().is("div.number-spin-btn-container")&&t.next().children().first().is("div.number-spin-btn-up")&&t.next().children().eq(1).is("div.number-spin-btn-down"))}).each(function(){n.polyfills.push(new n(this))}),e(this)},n=function(t){var i,r,o,s,a=this;if(this.elem=e(t),!(this.elem.is(":root *")&&this.elem.height()>0))throw Error("Element must be in DOM and displayed so that its height can be measured.");s=this.elem.outerHeight()/2+"px",this.upBtn=e("<div/>",{"class":"number-spin-btn number-spin-btn-up",style:"height: "+s}),this.downBtn=e("<div/>",{"class":"number-spin-btn number-spin-btn-down",style:"height: "+s}),this.btnContainer=e("<div/>",{"class":"number-spin-btn-container"}),i=e("<span/>",{style:"white-space: nowrap"}),this.upBtn.appendTo(this.btnContainer),this.downBtn.appendTo(this.btnContainer),this.elem.wrap(i),this.btnContainer.insertAfter(this.elem),this.elem.on({focus:function(){a.elem.on({DOMMouseScroll:n.domMouseScrollHandler,mousewheel:n.mouseWheelHandler},{p:a})},blur:function(){a.elem.off({DOMMouseScroll:n.domMouseScrollHandler,mousewheel:n.mouseWheelHandler})}}),this.elem.on({keypress:n.elemKeypressHandler,change:n.elemChangeHandler},{p:this}),this.upBtn.on("mousedown",{p:this,func:"increment"},n.elemBtnMousedownHandler),this.downBtn.on("mousedown",{p:this,func:"decrement"},n.elemBtnMousedownHandler),this.elem.css("textAlign","right"),this.attrMutationHandler("class"),"undefined"!=typeof WebKitMutationObserver&&null!==WebKitMutationObserver||r!==void 0&&null!==r?("undefined"==typeof WebKitMutationObserver||null===WebKitMutationObserver||void 0!==r&&null!==r||(r=WebKitMutationObserver),o=new r(function(e){var t,n,i;for(n=0,i=e.length;i>n;n++)t=e[n],"attributes"===t.type&&a.attrMutationHandler(t.attributeName,t.oldValue,a.elem.attr(t.attributeName))}),o.observe(t,{attributes:!0,attributeOldValue:!0,attributeFilter:["class","style","min","max","step"]})):"undefined"!=typeof MutationEvent&&null!==MutationEvent&&this.elem.on("DOMAttrModified",function(e){a.attrMutationHandler(e.originalEvent.attrName,e.originalEvent.prevValue,e.originalEvent.newValue)})},n.polyfills=[],n.isNumber=function(e){return null!=e&&"function"==typeof e.toString?/^-?\d+(?:\.\d+)?$/.test(""+e):!1},n.isFloat=function(e){return null!=e&&"function"==typeof e.toString?/^-?\d+\.\d+$/.test(""+e):!1},n.isInt=function(e){return null!=e&&"function"==typeof e.toString?/^-?\d+$/.test(""+e):!1},n.isNegative=function(e){return null!=e&&"function"==typeof e.toString?/^-\d+(?:\.\d+)?$/.test(""+e):!1},n.raiseNum=function(e){var t,i,r;if("number"==typeof e||"object"==typeof e&&e instanceof Number)return e%1?{num:""+e,precision:0}:n.raiseNum(""+e);if("string"==typeof e||"object"==typeof e&&e instanceof String){if(n.isFloat(e))return e=e.replace(/(\.\d)0+$/,"$1"),r=n.getPrecision(e),i=e.slice(0,-(r+1))+e.slice(-r),i=i.replace(/^(-?)0+(\d+)/,"$1$2"),t={num:i,precision:r};if(n.isInt(e))return{num:e,precision:0}}},n.raiseNumPrecision=function(e,n){var i,r;if(n>e.precision){for(t=i=r=e.precision;n>=r?n>i:i>n;t=n>=r?++i:--i)e.num+="0";e.precision=n}},n.lowerNum=function(e){if(e.precision>0){for(;e.num.length<e.precision+1;)e.num=n.isNegative(e.num)?e.num.slice(0,1)+"0"+e.num.slice(1):"0"+e.num;return(e.num.slice(0,-e.precision)+"."+e.num.slice(-e.precision)).replace(/\.?0+$/,"").replace(/^(-?)(\.)/,"$10$2")}return e.num},n.preciseAdd=function(e,t){var i,r,o;if(("number"==typeof e||"object"==typeof e&&e instanceof Number)&&("number"==typeof t||"object"==typeof t&&t instanceof Number))return 0===e%1&&0===t%1?""+(e+t):n.preciseAdd(""+e,""+t);if(("string"==typeof e||"object"==typeof e&&e instanceof String)&&("string"==typeof t||"object"==typeof t&&t instanceof String)){if(n.isNumber(e)){if(n.isNumber(t)){if(n.isInt(e)){if(n.isInt(t))return n.preciseAdd(parseInt(e,10),parseInt(t,10));n.isFloat(t)&&(e+=".0")}else n.isFloat(e)&&n.isInt(t)&&(t+=".0");if(i=n.raiseNum(e),r=n.raiseNum(t),i.precision<r.precision?n.raiseNumPrecision(i,r.precision):i.precision>r.precision&&n.raiseNumPrecision(r,i.precision),o=""+(parseInt(i.num,10)+parseInt(r.num,10)),i.precision>0){if(n.isNegative(o))for(;i.precision>o.length-1;)o="-0"+o.slice(1);else for(;i.precision>o.length;)o="0"+o;o=n.lowerNum({num:o,precision:i.precision})}return o=o.replace(/^(-?)\./,"$10."),n.isFloat(o)&&(o=o.replace(/0+$/,"")),o}throw new SyntaxError('Argument "'+t+'" is not a number.')}throw new SyntaxError('Argument "'+e+'" is not a number.')}return n.preciseAdd(""+e,""+t)},n.preciseSubtract=function(e,t){return"number"==typeof t||"object"==typeof t&&t instanceof Number?n.preciseAdd(e,-t):"string"==typeof t||"object"==typeof t&&t instanceof String?n.isNegative(t)?n.preciseAdd(e,t.slice(1)):n.preciseAdd(e,"-"+t):void 0},n.getPrecision=function(e){var t,i;if("number"==typeof e){for(t=0,i=e;i!==Math.floor(i);)i=e*Math.pow(10,++t);return t}return"string"==typeof e&&n.isNumber(e)?n.isFloat(e)?/^-?\d+(?:\.(\d+))?$/.exec(e)[1].length:0:void 0},n.prototype.getParams=function(){var e,t,i,r;return i=this.elem.attr("step"),t=this.elem.attr("min"),e=this.elem.attr("max"),r=this.elem.val(),n.isNumber(i)||(i=null),n.isNumber(t)||(t=null),n.isNumber(e)||(e=null),n.isNumber(r)||(r=t||0),{min:null!=t?t:null,max:null!=e?e:null,step:null!=i?i:"1",val:null!=r?r:null}},n.prototype.clipValues=function(e,t,n){return null!=n&&parseFloat(e)>parseFloat(n)?n:null!=t&&parseFloat(e)<parseFloat(t)?t:e},n.prototype.stepNormalize=function(e){var t,i,r,o,s;return r=this.getParams(),s=r.step,i=r.min,null==s?e:(s=n.raiseNum(s),t=n.raiseNum(e),t.precision>s.precision?n.raiseNumPrecision(s,t.precision):t.precision<s.precision&&n.raiseNumPrecision(t,s.precision),null!=i&&(t=n.raiseNum(n.preciseSubtract(e,i)),n.raiseNumPrecision(t,s.precision)),0===parseFloat(t.num)%parseFloat(s.num)?e:(t=n.lowerNum({num:""+Math.round(parseFloat(t.num)/(o=parseFloat(s.num)))*o,precision:t.precision}),null!=i&&(t=n.preciseAdd(t,i)),t))},n.domMouseScrollHandler=function(e){var t;t=e.data.p,e.preventDefault(),0>e.originalEvent.detail?t.increment():t.decrement()},n.mouseWheelHandler=function(e){var t;t=e.data.p,e.preventDefault(),e.originalEvent.wheelDelta>0?t.increment():t.decrement()},n.elemKeypressHandler=function(e){var t,n,i;t=e.data.p,38===e.keyCode?t.increment():40===e.keyCode?t.decrement():8!==(n=e.keyCode)&&9!==n&&35!==n&&36!==n&&37!==n&&39!==n&&46!==n&&45!==(i=e.which)&&46!==i&&48!==i&&49!==i&&50!==i&&51!==i&&52!==i&&53!==i&&54!==i&&55!==i&&56!==i&&57!==i&&e.preventDefault()},n.elemChangeHandler=function(e){var t,i,r,o;r=e.data.p,""!==r.elem.val()&&(n.isNumber(r.elem.val())?(o=r.getParams(),i=r.clipValues(o.val,o.min,o.max),i=r.stepNormalize(i),""+i!==r.elem.val()&&r.elem.val(i).change()):(t=r.elem.attr("min"),r.elem.val(null!=t&&n.isNumber(t)?t:"0").change()))},n.elemBtnMousedownHandler=function(t){var n,i,r,o,s=this;i=t.data.p,n=t.data.func,i[n](),o=function(){i[n](),i.timeoutID=window.setTimeout(o,10)},r=function(){window.clearTimeout(i.timeoutID),e(document).off("mouseup",r),e(s).off("mouseleave",r)},e(document).on("mouseup",r),e(this).on("mouseleave",r),i.timeoutID=window.setTimeout(o,700)},n.prototype.attrMutationHandler=function(e){var n,i,r,o,s;if("class"===e||"style"===e){for(i={},n=null,s=["opacity","visibility","-moz-transition-property","-moz-transition-duration","-moz-transition-timing-function","-moz-transition-delay","-webkit-transition-property","-webkit-transition-duration","-webkit-transition-timing-function","-webkit-transition-delay","-o-transition-property","-o-transition-duration","-o-transition-timing-function","-o-transition-delay","transition-property","transition-duration","transition-timing-function","transition-delay"],r=0,o=s.length;o>r;r++)t=s[r],(n=this.elem.css(t))!==this.btnContainer.css(t)&&(i[t]=n);i.display="none"===this.elem.css("display")?"none":"inline-block",this.btnContainer.css(i)}else("min"===e||"max"===e||"step"===e)&&this.elem.change()},n.prototype.increment=function(){var e,t;this.elem.is(":disabled")||this.elem.is("[readonly]")||(t=this.getParams(),e=n.preciseAdd(t.val,t.step),null!=t.max&&parseFloat(e)>parseFloat(t.max)&&(e=t.max),e=this.stepNormalize(e),this.elem.val(e).change())},n.prototype.decrement=function(){var e,t;this.elem.is(":disabled")||this.elem.is("[readonly]")||(t=this.getParams(),e=n.preciseSubtract(t.val,t.step),null!=t.min&&parseFloat(e)<parseFloat(t.min)&&(e=t.min),e=this.stepNormalize(e),this.elem.val(e).change())},e(function(){e('input[type="number"]').inputNumber()}),void 0)})(jQuery)}).call(this);
\ No newline at end of file
diff --git a/gui/js/simpledexactions.js b/gui/js/simpledexactions.js
index 6f71c0d..0babf7b 100644
--- a/gui/js/simpledexactions.js
+++ b/gui/js/simpledexactions.js
@@ -7,10 +7,6 @@ var check_swap_status_Internal = null;
 var check_my_prices_Internal = null;
 var check_bot_list_Internal = null;
 
-var coin_pair = ["BTC","KMD"]
-
-$('.coin.pair-one').html(coin_pair[0]);
-$('.coin.pair-two').html(coin_pair[1]);
 
 /*$.each($('.pair-one[data-coin]'), function(index, value) {
 	$('.pair-one[data-coin]').attr('data-coin', coin_pair[0]);
@@ -1744,7 +1740,7 @@ function check_bot_list(sig) {
 
 	var userpass = sessionStorage.getItem('mm_userpass');
 	var mypubkey = sessionStorage.getItem('mm_mypubkey');
-	var ajax_data = {"userpass":userpass,"method":"bot_list"};
+	var ajax_data = {"userpass":userpass,"method":"bot_statuslist"};
 	var url = "http://127.0.0.1:7783";
 
 	$.ajax({
@@ -1768,10 +1764,36 @@ function check_bot_list(sig) {
 				exchange_bot_list_tr += '</tr>';
 				$('.exchange_bot_list_tbl tbody').append(exchange_bot_list_tr);
 			} else {
+
+				if (!val.paused === false) {
+					var disable_resume_btn = ' ';
+					var disable_pause_btn = 'disabled="disabled"';
+				} else {
+					var disable_resume_btn = 'disabled="disabled"';
+					var disable_pause_btn = ' ';
+				}
+				if (!val.stopped === false) {
+					var disable_stop_btn = 'disabled="disabled"';
+				} else {
+					var disable_stop_btn = ' ';
+				}
+
+				if (!val.minprice === false){
+					var max_min_val = val.minprice;
+				}
+				if (!val.maxprice === false){
+					var max_min_val = val.maxprice;
+				}
+
 				var exchange_bot_list_tr = '';
 				exchange_bot_list_tr += '<tr>';
-				exchange_bot_list_tr += '<td>' + val + '</td>';
-				exchange_bot_list_tr += '<td style="text-align: center;"><div class="btn-group"><button class="btn btn-info btn_bot_status" data-botid="' + val + '" data-action="status"><span class="glyphicon glyphicon-cog" aria-hidden="true"></span> Status & Settings</button><button class="btn btn-success btn_bot_resume" data-botid="' + val + '" data-action="resume"><span class="glyphicon glyphicon-play" aria-hidden="true"></span> Resume</button><button class="btn btn-warning btn_bot_pause" data-botid="' + val + '" data-action="pause"><span class="glyphicon glyphicon-pause" aria-hidden="true"></span> Pause</button><button class="btn btn-danger btn_bot_stop" data-botid="' + val + '" data-action="stop"><span class="glyphicon glyphicon-stop" aria-hidden="true"></span> Stop</button></div></td>';
+				//exchange_bot_list_tr += '<td>'+val.botid+'</td>';
+				exchange_bot_list_tr += '<td>'+val.name+'</td>';
+				exchange_bot_list_tr += '<td>'+val.action+'</td>';
+				exchange_bot_list_tr += '<td>'+max_min_val+'</td>';
+				exchange_bot_list_tr += '<td>'+val.totalrelvolume+'</td>';
+				exchange_bot_list_tr += '<td>'+val.trades.length+'</td>';
+				exchange_bot_list_tr += '<td style="text-align: center;"><div class="btn-group"><button class="btn btn-info btn_bot_status" data-botid="' + val.botid + '" data-action="status"><span class="glyphicon glyphicon-cog" aria-hidden="true"></span></button><button class="btn btn-success btn_bot_resume" data-botid="' + val.botid + '" data-action="resume" ' + disable_resume_btn + '><span class="glyphicon glyphicon-play" aria-hidden="true"></span></button><button class="btn btn-warning btn_bot_pause" data-botid="' + val.botid + '" data-action="pause" ' + disable_pause_btn + '><span class="glyphicon glyphicon-pause" aria-hidden="true"></span></button><button class="btn btn-danger btn_bot_stop" data-botid="' + val.botid + '" data-action="stop" ' + disable_stop_btn + '><span class="glyphicon glyphicon-stop" aria-hidden="true"></span></button></div></td>';
 				exchange_bot_list_tr += '</tr>';
 				$('.exchange_bot_list_tbl tbody').append(exchange_bot_list_tr);
 			}
@@ -1790,14 +1812,21 @@ function bot_buy_sell(bot_data) {
 
 	buying_or_selling = $('input[name=trading_pair_options]:checked').val();
 
-	if(buying_or_selling == 'buying') {
+	/*if(buying_or_selling == 'buying') {
 		var base_coin = coin;
 		var rel_coin = $('.trading_pair_coin').selectpicker('val');
 	}
 	if(buying_or_selling == 'selling') {
 		var base_coin = $('.trading_pair_coin').selectpicker('val');
 		var rel_coin = coin;
-	}
+	}*/
+
+	var base_coin = coin;
+	var rel_coin = $('.trading_pair_coin').selectpicker('val');
+
+	console.log('BUYING or SELLING??: ' + buying_or_selling);
+	console.log('BASE: ' + base_coin);
+	console.log('REL: '+ rel_coin);
 
 	var userpass = sessionStorage.getItem('mm_userpass');
 	var mypubkey = sessionStorage.getItem('mm_mypubkey');
@@ -1809,6 +1838,8 @@ function bot_buy_sell(bot_data) {
 		var ajax_data = {"userpass":userpass,"method":"bot_sell","base":base_coin,"rel":rel_coin,"minprice":bot_data.price,"basevolume":bot_data.volume};
 	}
 
+	console.log(ajax_data);
+
 	var url = "http://127.0.0.1:7783";
 
 	$.ajax({
@@ -1873,6 +1904,40 @@ function bot_stop_pause_resume(bot_data) {
 	check_bot_list();
 }
 
+function bot_settings(bot_data) {
+	console.log(bot_data);
+	
+	var userpass = sessionStorage.getItem('mm_userpass');
+	var mypubkey = sessionStorage.getItem('mm_mypubkey');
+	var ajax_data = {"userpass":userpass,"method":"bot_settings","botid":bot_data.botid,"newprice":bot_data.newprice,"newvolume":bot_data.newvolume};
+
+	console.log(ajax_data);
+	
+	var url = "http://127.0.0.1:7783";
+
+	$.ajax({
+		async: true,
+	    data: JSON.stringify(ajax_data),
+	    dataType: 'json',
+	    type: 'POST',
+	    url: url
+	}).done(function(data) {
+		// If successful
+		console.log(data);
+
+		if (!data.error === false) {
+			toastr.error(data.error, 'Bot Info');
+		} else if (data.result == 'success') {
+			toastr.success('Bot ID: ' + bot_data.botid + ' Updateded', 'Bot Info');
+		}
+	}).fail(function(jqXHR, textStatus, errorThrown) {
+	    // If fail
+	    console.log(textStatus + ': ' + errorThrown);
+	});
+
+	check_bot_list();
+}
+
 
 function bot_status(bot_data) {
 	console.log(bot_data);
@@ -1895,6 +1960,17 @@ function bot_status(bot_data) {
 			toastr.error(data.error, 'Bot Info');
 		} else if (data.result == 'success') {
 
+			var max_min = null;
+			var max_min_val = null;
+			if (!data.minprice === false){
+				max_min = 'Minimum';
+				max_min_val = data.minprice;
+			}
+			if (!data.maxprice === false){
+				max_min = 'Maximum';
+				max_min_val = data.maxprice;
+			}
+
 			result_answer = (data.result == 'success') ? '<h4><span class="label label-success"><span class="glyphicon glyphicon-ok" aria-hidden="true"></span> Success</span></h4>' : '<h4><span class="label label-danger"><span class="glyphicon glyphicon-warning-sign" aria-hidden="true"></span> ' + data.result + '</span></h4>';
 			rel_answer = '<img src="img/cryptologo/'+data.rel.toLowerCase()+'.png" style="width: 30px;"> '+ return_coin_name(data.rel) + ' ('+data.rel+')';
 			base_answer = '<img src="img/cryptologo/'+data.base.toLowerCase()+'.png" style="width: 30px;"> '+ return_coin_name(data.base) + ' ('+data.base+')';
@@ -1905,11 +1981,11 @@ function bot_status(bot_data) {
 			buy_sell_text = (data.action == 'buy') ? 'Buy' : 'Sell';
 			max_min_text = (data.action == 'buy') ? 'Max' : 'Min';
 
-			bootbox.dialog({
+			var bot_update_bootbox = bootbox.dialog({
 				message: `
 					<table width="100%" class="table table-striped">
 						<tr>
-							<td>Auto Trader ID</td>
+							<td style="width: 150px;">Auto Trader ID</td>
 							<td>` + data.botid + `</td>
 						</tr>
 						<tr>
@@ -1929,8 +2005,8 @@ function bot_status(bot_data) {
 							<td>` + base_answer + `</td>
 						</tr>
 						<tr>
-							<td>Max Price</td>
-							<td>` + data.maxprice + ` ` + data.rel + `</td>
+							<td>` + max_min + ` Price</td>
+							<td>` + max_min_val + ` ` + data.rel + `</td>
 						</tr>
 						<tr>
 							<td>Total Selling Volume</td>
@@ -1959,22 +2035,19 @@ function bot_status(bot_data) {
 								<div class="panel-body"> <!-- panel-body -->
 
 									<div class="form-group">
-										<span style="float: right; font-size: 18px;"><span>Max</span> Price to <span>Buy</span></span>
+										<span style="float: right; font-size: 18px;"><span>New ` + max_min_text + `</span> Price to <span>` + buy_sell_text + `</span></span>
 									</div>
 									<div class="input-group col-sm-12">
 										<span class="input-group-addon">` + rel_form + `</span>
-										<input type="text" class="form-control trading_pair_coin_newprice" placeholder="Price e.g. 0.01" style="height: 64px; font-size: 20px;">
+										<input type="number" class="form-control trading_pair_coin_newprice" placeholder="Price e.g. 0.01" style="height: 64px; font-size: 20px;">
 										<span class="input-group-addon" id="trading_pair_coin_price_max_min_update" style="font-size: 20px;">` + max_min_text + `</span>
 									</div>
 									<div class="form-group" style="margin-top: 15px; margin-bottom: 0px;">
-										<span style="font-size: 18px;"><span>Max</span> Amount to <span>` + buy_sell_text + `</span></span>
+										<span style="font-size: 18px;"><span>New Max</span> Amount to <span>` + buy_sell_text + `</span></span>
 									</div>
 									<div class="input-group col-sm-12">
 										<span class="input-group-addon coin_ticker" id="trading_pair_coin_ticker" style="font-size: 20px;">` + base_form + `</span>
-										<input type="text" class="form-control trading_pair_coin_newvolume" placeholder="Amount e.g. 12.5" style="height: 64px; font-size: 20px;">
-										<span class="input-group-btn">
-											<button class="btn btn-primary btn-bot_update" data-action="` + buy_sell_text + `" style="height: 64px; font-size: 20px;">UPDATE</button>
-										</span>
+										<input type="number" class="form-control trading_pair_coin_newvolume" placeholder="Amount e.g. 12.5" style="height: 64px; font-size: 20px;">
 									</div>
 
 
@@ -1995,21 +2068,86 @@ function bot_status(bot_data) {
 					},
 					ok: {
 						label: "Update",
-						className: 'btn-primary',
+						className: 'btn-primary btn-bot_settings_update',
 						callback: function(){
-							console.log($('.trading_pair_coin_newprice').val())
-							console.log($('.trading_pair_coin_newvolume').val())
-							console.log(data.rel);
-							console.log(data.base);
-							//bot_update_data = {}
-							//bot_update_data.rel = data.rel;
+							//console.log($('.trading_pair_coin_newprice').val())
+							//console.log($('.trading_pair_coin_newvolume').val())
+							//console.log(data.rel);
+							//console.log(data.base);
+							bot_update_data = {}
+							bot_update_data.rel = data.rel;
+							bot_update_data.base = data.base;
+							bot_update_data.botid = data.botid;
+							bot_update_data.newprice = $('.trading_pair_coin_newprice').val();
+							bot_update_data.newvolume = $('.trading_pair_coin_newvolume').val();
+
+							//console.log(bot_update_data);
+
+							bot_settings(bot_update_data);
 
 						}
 					}
 				}
 			});
+			bot_update_bootbox.init(function(){
+				console.log('bot_update_settings dialog opened.')
+				$('.btn-bot_settings_update').attr("disabled", "disabled");
+				$('.trading_pair_coin_newprice').inputNumber();
+				$('.trading_pair_coin_newvolume').inputNumber();
 
-			toastr.success('Bot ID: ' + bot_data.botid + ' ' + bot_data.action + ' presented.', 'Bot Info');
+
+				$('.trading_pair_coin_newprice').keyup(function() {
+
+					var max_min_newprice = $('.trading_pair_coin_newprice')
+					var max_newvolume = $('.trading_pair_coin_newvolume')
+
+					var empty = false;
+					if (max_min_newprice.val().length == 0 ) {
+						console.log('new price is empty');
+						empty = true;
+					} else if (max_min_newprice.val().length !== 0 ) {
+						console.log('NEW PRICE IS :' + max_min_newprice.val());
+						empty = false;
+					}
+					console.log(empty);
+
+
+					if (empty){
+						$('.btn-bot_settings_update').attr("disabled", "disabled");
+					} else {
+						$('.btn-bot_settings_update').removeAttr("disabled");
+					}
+
+				});
+
+				$('.trading_pair_coin_newvolume').keyup(function() {
+
+					var max_min_newprice = $('.trading_pair_coin_newprice')
+					var max_newvolume = $('.trading_pair_coin_newvolume')
+
+					var empty = false;
+					if (max_newvolume.val().length == 0 ) {
+						console.log('new price is empty');
+						empty = true;
+					} else if (max_newvolume.val().length !== 0 ) {
+						console.log('NEW PRICE IS :' + max_newvolume.val());
+						empty = false;
+					}
+					console.log(empty);
+
+
+					if (empty){
+						$('.btn-bot_settings_update').attr("disabled", "disabled");
+					} else {
+						$('.btn-bot_settings_update').removeAttr("disabled");
+					}
+
+				});
+
+				
+			});
+
+			//toastr.success('Bot ID: ' + bot_data.botid + ' ' + bot_data.action + ' presented.', 'Bot Info');
 		}
 	}).fail(function(jqXHR, textStatus, errorThrown) {
 	    // If fail
@@ -2181,8 +2319,10 @@ function check_swap_status(sig) {
 		// If successful
 		//console.log(data);
 
+		var reversed_swap_list = data.swaps.reverse();
+
 		$('.exchange_swap_status_tbl tbody').empty();
-		$.each(data.swaps, function(index, val) {
+		$.each(reversed_swap_list, function(index, val) {
 			//console.log(index);
 			//console.log(val);
 			if(!val.error === false) {