diff --git a/webapp/metviewer/js/metviewer_common.js b/webapp/metviewer/js/metviewer_common.js
index 6225dd2a..6fbbd205 100644
--- a/webapp/metviewer/js/metviewer_common.js
+++ b/webapp/metviewer/js/metviewer_common.js
@@ -7333,17 +7333,18 @@ function updateResult(result) {
             document.getElementById('plot_sql').innerHTML = "";
         }
     });
+
     $.ajax({
         type: "GET",
-        url: urlOutput + "scripts/" + resultName + ".R",
+        url: urlOutput + "data/" + resultName + ".yaml",
         dataType: "text",
         contentType: 'text/plain',
         mimeType: 'text',
         complete: function (data) {
-            document.getElementById('r_script').innerHTML = (data.responseText).replace(/\n/g, '<br />');
+            document.getElementById('plot_yaml').innerHTML = (data.responseText).replace(/\n/g, '<br />');
         },
         error: function () {
-            document.getElementById('r_script').innerHTML = "";
+            document.getElementById('plot_yaml').innerHTML = "";
         }
     });
     $.ajax({
@@ -7361,7 +7362,7 @@ function updateResult(result) {
     });
 
     $('#ui-tabs-1').empty();
-    $("#r_data_url").prop("href", urlOutput + "data/" + resultName + ".data");
+    $("#plot_data_url").prop("href", urlOutput + "data/" + resultName + ".data");
     $("#y1_points_url").prop("href", urlOutput + "data/" + resultName + ".points1");
     $("#y2_points_url").prop("href", urlOutput + "data/" + resultName + ".points2");
 
diff --git a/webapp/metviewer/js/metviewer_common.min.js b/webapp/metviewer/js/metviewer_common.min.js
index fbcb9a0e..d4133099 100644
--- a/webapp/metviewer/js/metviewer_common.min.js
+++ b/webapp/metviewer/js/metviewer_common.min.js
@@ -328,8 +328,8 @@ function querySt(a){for(var b=window.location.href.split(/[\?&]+/),d=0;d<b.lengt
 function viewImage(a){boxID+=1;window_center+=20;window_top+=20;$("<div>").dialog({height:"655",width:"815",autoOpen:!1,resizable:!0,closeOnEscape:!0,focus:!0,dialogClass:"dialog-box-"+boxID,title:a,position:{my:"center+"+window_center+" top+"+window_top,at:"center top",of:window},close:function(a){$(this).empty();$(this).dialog("destroy");window_center-=20;window_top-=20},open:function(b){$(this).html('<img src="'+urlOutput+"plots/plot_"+a+".png?"+(new Date).getTime()+'" onError="this.src=\'images/no_image.png\';"/>')}}).dialog("open")}
 function updateResult(a){resultName=a;$("#plot_display_inner_header").text(resultName.replace("plot_",""));$("#plot_image").empty();$.get(urlOutput+"plots/"+resultName+".html",function(a){$("#plot_image").append(a)}).fail(function(){var a=$("<img>");a.attr("width","100%");a.attr("height","100%");a.appendTo("#plot_image");a.error(function(){$(this).attr("src","images/no_image.png")}).attr("src",urlOutput+"plots/"+resultName+".png?"+(new Date).getTime())});$.ajax({type:"GET",url:urlOutput+"xml/"+resultName+
 ".xml",dataType:"xml",success:function(a){a="msie"===jQuery.browser?a.xml:(new XMLSerializer).serializeToString(a);document.getElementById("plot_xml").innerHTML=formatXml(a).replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/ /g,"&nbsp;").replace(/\n/g,"<br />")},error:function(){document.getElementById("plot_xml").innerHTML=""}});$.ajax({type:"GET",url:urlOutput+"xml/"+resultName+".sql",dataType:"text",contentType:"text/plain",mimeType:"text",complete:function(a){document.getElementById("plot_sql").innerHTML=
-a.responseText.replace(/\n/g,"<br />")},error:function(){document.getElementById("plot_sql").innerHTML=""}});$.ajax({type:"GET",url:urlOutput+"scripts/"+resultName+".R",dataType:"text",contentType:"text/plain",mimeType:"text",complete:function(a){document.getElementById("r_script").innerHTML=a.responseText.replace(/\n/g,"<br />")},error:function(){document.getElementById("r_script").innerHTML=""}});$.ajax({type:"GET",url:urlOutput+"xml/"+resultName+".log",dataType:"text",contentType:"text/plain",
-mimeType:"text",complete:function(a){document.getElementById("plot_log").innerHTML=a.responseText.replace(/\n/g,"<br />")},error:function(){document.getElementById("plot_log").innerHTML=""}});$("#ui-tabs-1").empty();$("#r_data_url").prop("href",urlOutput+"data/"+resultName+".data");$("#y1_points_url").prop("href",urlOutput+"data/"+resultName+".points1");$("#y2_points_url").prop("href",urlOutput+"data/"+resultName+".points2")}
+a.responseText.replace(/\n/g,"<br />")},error:function(){document.getElementById("plot_sql").innerHTML=""}});$.ajax({type:"GET",url:urlOutput+"data/"+resultName+".yaml",dataType:"text",contentType:"text/plain",mimeType:"text",complete:function(a){document.getElementById("plot_yaml").innerHTML=a.responseText.replace(/\n/g,"<br />")},error:function(){document.getElementById("plot_yaml").innerHTML=""}});$.ajax({type:"GET",url:urlOutput+"xml/"+resultName+".log",dataType:"text",contentType:"text/plain",
+mimeType:"text",complete:function(a){document.getElementById("plot_log").innerHTML=a.responseText.replace(/\n/g,"<br />")},error:function(){document.getElementById("plot_log").innerHTML=""}});$("#ui-tabs-1").empty();$("#plot_data_url").prop("href",urlOutput+"data/"+resultName+".data");$("#y1_points_url").prop("href",urlOutput+"data/"+resultName+".points1");$("#y2_points_url").prop("href",urlOutput+"data/"+resultName+".points2")}
 function initPage(){$("#uncheck_all").click(function(){$("input[name='multiselect_database']").each(function(){this.checked=!1});var a=document.createTextNode("Select database"),b=document.getElementById("categories1").childNodes[0];b.replaceChild(a,b.childNodes[0]);updatePages()});outerLayout=$("body").layout({name:"outer",north__paneSelector:"#header",south__paneSelector:"#series_formatting",north__closable:!1,north__resizable:!1,north__spacing_open:0,north__size:55,east__paneSelector:"#plot_display",
 center__paneSelector:"#plot_config",south__minSize:112,east__size:"50%",east__minSize:100,east__maxSize:800,east__onresize:"innerLayout.resizeAll",resizeWhileDragging:!0,east__closable:!1,west__resizable:!0,west__spacing_closed:15,west__togglerLength_closed:20,west__togglerAlign_closed:"top",west__paneSelector:"#history",west__initClosed:!0,west__togglerLength_open:0,west__initClose:!0,west__togglerTip_open:"Close History",west__togglerTip_closed:"Open History",west__togglerClass:"history-toggler",
 west__fxName:"slide",autoBindCustomButtons:!0,south__togglerLength_open:10,west__onopen_start:function(){refreshHistory()},useStateCookie:!1});$("#plot_display_inner").tabs({heightStyle:"content",beforeActivate:function(a,b){currentPlotTab=b.newPanel.attr("aria-labelledby")},load:function(a,b){a=$("<pre/>").text(b.panel.text());b.panel.empty();b.panel.append(a)},create:function(a,b){}});$("#tab-south").tabs({collapsible:!1});innerLayout=$("#plot_display").layout({name:"inner",closable:!1,center__paneSelector:"#plot_display_inner",
diff --git a/webapp/metviewer/metviewer1.jsp b/webapp/metviewer/metviewer1.jsp
index f182d975..c52fc787 100644
--- a/webapp/metviewer/metviewer1.jsp
+++ b/webapp/metviewer/metviewer1.jsp
@@ -351,8 +351,8 @@
       <li><a href="#plot_image" id="plot_image_url">Plot</a></li>
       <li><a href="#plot_xml" id="plot_xml_url" >XML</a></li>
       <li><a href="#plot_log" id="plot_log_url" >Log</a></li>
-      <li><a href="#r_script" id="r_script_url" >R script</a></li>
-      <li><a id="r_data_url" href="R_work/data/.data" onerror="alert(1)" type="text/plain" >R data</a></li>
+      <li><a href="#plot_yaml" id="plot_yaml_url" >Plot config</a></li>
+      <li><a id="plot_data_url" href="R_work/data/.data" onerror="alert(1)" type="text/plain" >Plot data</a></li>
       <li><a href="#plot_sql" id="plot_sql_url">SQL</a></li>
       <li><a id="y1_points_url" href="R_work/data/.points1" type="text/plain" >Y1 Points</a></li>
       <li><a id="y2_points_url" href="R_work/data/.points2" type="text/plain" >Y2 Points</a></li>
@@ -370,12 +370,11 @@
 
       <div id="plot_log">
       </div>
-      <div id="r_script">
+      <div id="plot_yaml">
       </div>
-      <div id="r_data">
+      <div id="plot_data">
       </div>
       <div id="plot_sql">
-
       </div>
       <div id="y1_points">