diff --git a/WebApiTestClient/WebApiTestClient/Areas/HelpPage/TestClient.css b/WebApiTestClient/WebApiTestClient/Areas/HelpPage/TestClient.css
index 6c733af..bbcf039 100644
--- a/WebApiTestClient/WebApiTestClient/Areas/HelpPage/TestClient.css
+++ b/WebApiTestClient/WebApiTestClient/Areas/HelpPage/TestClient.css
@@ -35,4 +35,15 @@ select {
     width: 100px;
     float: left;
     border: none;
+}
+
+.formattedJson {
+    white-space: pre;
+    width:300px;
+    height:300px;
+}
+
+#formattedResponseTab {
+    overflow:auto;
+    height:400px
 }
\ No newline at end of file
diff --git a/WebApiTestClient/WebApiTestClient/Areas/HelpPage/Views/Help/DisplayTemplates/TestClientDialogs.cshtml.pp b/WebApiTestClient/WebApiTestClient/Areas/HelpPage/Views/Help/DisplayTemplates/TestClientDialogs.cshtml.pp
index f0a4f9d..5981ac1 100644
--- a/WebApiTestClient/WebApiTestClient/Areas/HelpPage/Views/Help/DisplayTemplates/TestClientDialogs.cshtml.pp
+++ b/WebApiTestClient/WebApiTestClient/Areas/HelpPage/Views/Help/DisplayTemplates/TestClientDialogs.cshtml.pp
@@ -61,7 +61,18 @@
   </div>
   <div class="responseBodyDiv">
     <h5 class="ui-widget-header">Body</h5>
-    <textarea spellcheck="false" data-bind="value: content" class="sampleArea" readonly='readonly' rows="10"></textarea>
+    <div id="responseTabsLinks">
+		<ul>
+			<li><a href="#rawResponseTab">Raw</a></li>
+			<li data-bind="visible:formattedContent!=null"><a href="#formattedResponseTab">Formatted</a></li>
+		</ul>
+		<div id="rawResponseTab">
+			<textarea spellcheck="false" data-bind="value: content" class="sampleArea" readonly='readonly' rows="10"></textarea>
+		</div>
+		<div id="formattedResponseTab">
+			<div class="formattedJson" data-bind="text: formattedContent"></div>
+		</div>
+	</div> 
   </div>
 </div>
 
diff --git a/WebApiTestClient/WebApiTestClient/Areas/HelpPage/Views/Help/DisplayTemplates/TestClientReferences.cshtml b/WebApiTestClient/WebApiTestClient/Areas/HelpPage/Views/Help/DisplayTemplates/TestClientReferences.cshtml
index 4cdd3a0..c61e8ae 100644
--- a/WebApiTestClient/WebApiTestClient/Areas/HelpPage/Views/Help/DisplayTemplates/TestClientReferences.cshtml
+++ b/WebApiTestClient/WebApiTestClient/Areas/HelpPage/Views/Help/DisplayTemplates/TestClientReferences.cshtml
@@ -7,4 +7,5 @@
 {
     <script src="~/Scripts/@Path.GetFileName(item)"></script>
 }
+<script src="~/Scripts/vkbeautify.js"></script>
 <script src="~/Scripts/WebApiTestClient.js" defer="defer"></script>
\ No newline at end of file
diff --git a/WebApiTestClient/WebApiTestClient/Scripts/WebApiTestClient.js b/WebApiTestClient/WebApiTestClient/Scripts/WebApiTestClient.js
index e04d68c..933e436 100644
--- a/WebApiTestClient/WebApiTestClient/Scripts/WebApiTestClient.js
+++ b/WebApiTestClient/WebApiTestClient/Scripts/WebApiTestClient.js
@@ -22,6 +22,128 @@ var emptyTestClientModel =
         return path;
     }
 
+    function decodeSample(sampleString) {
+        return unescape(sampleString).replace(/\+/gi, " ").replace(/\r\n/gi, "\n");
+    }
+
+    function addOrReplaceHeader(headers, headerName, headerValue) {
+        var headerList = headers();
+        for (var i in headerList) {
+            if (headerList[i].name.toLowerCase() == headerName) {
+                headers.replace(headerList[i], { name: headerList[i].name, value: headerValue });
+                return;
+            }
+        }
+        headers.push({ name: headerName, value: headerValue });
+    }
+
+    function SendRequest(httpMethod, url, requestHeaders, requestBody, handleResponse) {
+        if (httpMethod.length == 0) {
+            alert("HTTP Method should not be empty");
+            return false;
+        }
+
+        if (url.length == 0) {
+            alert("Url should not be empty");
+            return false;
+        }
+
+        var httpRequest = new XMLHttpRequest();
+        try {
+            httpRequest.open(httpMethod, encodeURI(url), false);
+        }
+        catch (e) {
+            alert("Cannot send request. Check the security setting of your browser if you are sending request to a different domain.");
+            return false;
+        }
+
+        httpRequest.setRequestHeader("If-Modified-Since", new Date(0));
+        try {
+            for (var i in requestHeaders) {
+                var header = requestHeaders[i];
+                httpRequest.setRequestHeader(header.name, header.value);
+            }
+        } catch (e) {
+            alert("Invalid header.");
+            return false;
+        }
+
+        httpRequest.onreadystatechange = function () {
+            switch (this.readyState) {
+                case 4:
+                    handleResponse(httpRequest);
+                    break;
+                default:
+                    break;
+            }
+        };
+
+        httpRequest.ontimeout = function () {
+            alert("Request timed out.");
+        };
+
+        httpRequest.send(requestBody);
+
+        return true;
+    }
+
+    function getFormattedJson(json) {
+        var result = vkbeautify.json(json);
+        return result;
+    }
+
+    function getFormattedXml(xml) {
+        var result = vkbeautify.xml(xml);
+        return result;
+    }
+
+    var ContentTypes = {
+        JSON: "application/json",
+        XML: "text/xml"
+    };
+
+    function getFormattedContent(rawResponse, contentType) {
+        if (contentType.is(ContentTypes.JSON)) {
+            return getFormattedJson(rawResponse);
+        }
+        else if (contentType.is(ContentTypes.XML)) {
+            return getFormattedXml(rawResponse);
+        }
+
+        return null;
+    }
+
+    function getContentType(request) {
+        var result = function () {
+            var self = this;
+            self.value = request.getResponseHeader('content-type');
+            self.is = function (expectedContentType) {
+                return self.value.indexOf(expectedContentType) > -1;
+            };
+            return self;
+        };
+        return new result();
+    }
+
+    function getHttpResponse(httpRequest) {
+        var statusCode = httpRequest.status,
+            statusText = httpRequest.statusText,
+            responseHeaders = httpRequest.getAllResponseHeaders(),
+            rawResponse = httpRequest.responseText,
+            contentType = getContentType(httpRequest),
+            formattedResponse = getFormattedContent(rawResponse, contentType);
+
+        // IE - #1450: sometimes returns 1223 when it should be 204
+        if (statusCode === 1223) {
+            statusCode = 204;
+            statusText = "No Content";
+        }
+
+        var responseStatus = statusCode + "/" + statusText;
+
+        return { status: responseStatus, headers: responseHeaders, content: rawResponse, formattedContent: formattedResponse };
+    }
+
     function TestClientViewModel(data) {
         var self = this;
         self.HttpMethod = ko.observable(data.HttpMethod);
@@ -99,7 +221,7 @@ var emptyTestClientModel =
             open: function () {
                 jQuery('.ui-widget-overlay').bind('click', function () {
                     jQuery('#testClientDialog').dialog('close');
-                })
+                });
             },
             buttons: {
                 "Send": function () {
@@ -114,9 +236,10 @@ var emptyTestClientModel =
             width: "550",
             modal: true,
             open: function () {
+                $("#responseTabsLinks").tabs({ selected: 0 });
                 jQuery('.ui-widget-overlay').bind('click', function () {
                     jQuery('#testClientResponseDialog').dialog('close');
-                })
+                });
             }
         });
 
@@ -130,84 +253,3 @@ var emptyTestClientModel =
     ko.applyBindings(new TestClientViewModel(initialModel));
 })();
 
-function decodeSample(sampleString) {
-    return unescape(sampleString).replace(/\+/gi, " ").replace(/\r\n/gi, "\n");
-}
-
-function addOrReplaceHeader(headers, headerName, headerValue) {
-    var headerList = headers();
-    for (var i in headerList) {
-        if (headerList[i].name.toLowerCase() == headerName) {
-            headers.replace(headerList[i], { name: headerList[i].name, value: headerValue });
-            return;
-        }
-    }
-    headers.push({ name: headerName, value: headerValue });
-}
-
-function SendRequest(httpMethod, url, requestHeaders, requestBody, handleResponse) {
-    if (httpMethod.length == 0) {
-        alert("HTTP Method should not be empty");
-        return false;
-    }
-
-    if (url.length == 0) {
-        alert("Url should not be empty");
-        return false;
-    }
-
-    var httpRequest = new XMLHttpRequest();
-    try {
-        httpRequest.open(httpMethod, encodeURI(url), false);
-    }
-    catch (e) {
-        alert("Cannot send request. Check the security setting of your browser if you are sending request to a different domain.");
-        return false;
-    }
-
-    httpRequest.setRequestHeader("If-Modified-Since", new Date(0));
-    try {
-        for (var i in requestHeaders) {
-            var header = requestHeaders[i];
-            httpRequest.setRequestHeader(header.name, header.value);
-        }
-    } catch (e) {
-        alert("Invalid header.");
-        return false;
-    }
-
-    httpRequest.onreadystatechange = function () {
-        switch (this.readyState) {
-            case 4:
-                handleResponse(httpRequest);
-                break;
-            default:
-                break;
-        }
-    }
-
-    httpRequest.ontimeout = function () {
-        alert("Request timed out.");
-    }
-
-    httpRequest.send(requestBody);
-
-    return true;
-}
-
-function getHttpResponse(httpRequest) {
-    var statusCode = httpRequest.status;
-    var statusText = httpRequest.statusText;
-    var responseHeaders = httpRequest.getAllResponseHeaders();
-    var rawResponse = httpRequest.responseText;
-
-    // IE - #1450: sometimes returns 1223 when it should be 204
-    if (statusCode === 1223) {
-        statusCode = 204;
-        statusText = "No Content";
-    }
-
-    var responseStatus = statusCode + "/" + statusText;
-
-    return { status: responseStatus, headers: responseHeaders, content: rawResponse };
-}
\ No newline at end of file
diff --git a/WebApiTestClient/WebApiTestClient/Scripts/vkbeautify.js b/WebApiTestClient/WebApiTestClient/Scripts/vkbeautify.js
new file mode 100644
index 0000000..1c2b496
--- /dev/null
+++ b/WebApiTestClient/WebApiTestClient/Scripts/vkbeautify.js
@@ -0,0 +1,358 @@
+/**
+* vkBeautify - javascript plugin to pretty-print or minify text in XML, JSON, CSS and SQL formats.
+*  
+* Version - 0.99.00.beta 
+* Copyright (c) 2012 Vadim Kiryukhin
+* vkiryukhin @ gmail.com
+* http://www.eslinstructor.net/vkbeautify/
+* 
+* Dual licensed under the MIT and GPL licenses:
+*   http://www.opensource.org/licenses/mit-license.php
+*   http://www.gnu.org/licenses/gpl.html
+*
+*   Pretty print
+*
+*        vkbeautify.xml(text [,indent_pattern]);
+*        vkbeautify.json(text [,indent_pattern]);
+*        vkbeautify.css(text [,indent_pattern]);
+*        vkbeautify.sql(text [,indent_pattern]);
+*
+*        @text - String; text to beatufy;
+*        @indent_pattern - Integer | String;
+*                Integer:  number of white spaces;
+*                String:   character string to visualize indentation ( can also be a set of white spaces )
+*   Minify
+*
+*        vkbeautify.xmlmin(text [,preserve_comments]);
+*        vkbeautify.jsonmin(text);
+*        vkbeautify.cssmin(text [,preserve_comments]);
+*        vkbeautify.sqlmin(text);
+*
+*        @text - String; text to minify;
+*        @preserve_comments - Bool; [optional];
+*                Set this flag to true to prevent removing comments from @text ( minxml and mincss functions only. )
+*
+*   Examples:
+*        vkbeautify.xml(text); // pretty print XML
+*        vkbeautify.json(text, 4 ); // pretty print JSON
+*        vkbeautify.css(text, '. . . .'); // pretty print CSS
+*        vkbeautify.sql(text, '----'); // pretty print SQL
+*
+*        vkbeautify.xmlmin(text, true);// minify XML, preserve comments
+*        vkbeautify.jsonmin(text);// minify JSON
+*        vkbeautify.cssmin(text);// minify CSS, remove comments ( default )
+*        vkbeautify.sqlmin(text);// minify SQL
+*
+*/
+
+(function() {
+
+    function createShiftArr(step) {
+
+        var space = '    ';
+	
+        if ( isNaN(parseInt(step)) ) {  // argument is string
+            space = step;
+        } else { // argument is integer
+            switch(step) {
+                case 1: space = ' '; break;
+                case 2: space = '  '; break;
+                case 3: space = '   '; break;
+                case 4: space = '    '; break;
+                case 5: space = '     '; break;
+                case 6: space = '      '; break;
+                case 7: space = '       '; break;
+                case 8: space = '        '; break;
+                case 9: space = '         '; break;
+                case 10: space = '          '; break;
+                case 11: space = '           '; break;
+                case 12: space = '            '; break;
+            }
+        }
+
+        var shift = ['\n']; // array of shifts
+        for(ix=0;ix<100;ix++){
+            shift.push(shift[ix]+space); 
+        }
+        return shift;
+    }
+
+    function vkbeautify(){
+        this.step = '    '; // 4 spaces
+        this.shift = createShiftArr(this.step);
+    };
+
+    vkbeautify.prototype.xml = function(text,step) {
+
+        var ar = text.replace(/>\s{0,}</g,"><")
+                     .replace(/</g,"~::~<")
+                     .replace(/\s*xmlns\:/g,"~::~xmlns:")
+                     .replace(/\s*xmlns\=/g,"~::~xmlns=")
+                     .split('~::~'),
+            len = ar.length,
+            inComment = false,
+            deep = 0,
+            str = '',
+            ix = 0,
+            shift = step ? createShiftArr(step) : this.shift;
+
+        for(ix=0;ix<len;ix++) {
+            // start comment or <![CDATA[...]]> or <!DOCTYPE //
+            if(ar[ix].search(/<!/) > -1) { 
+                str += shift[deep]+ar[ix];
+                inComment = true; 
+                // end comment  or <![CDATA[...]]> //
+                if(ar[ix].search(/-->/) > -1 || ar[ix].search(/\]>/) > -1 || ar[ix].search(/!DOCTYPE/) > -1 ) { 
+                    inComment = false; 
+                }
+            } else 
+                // end comment  or <![CDATA[...]]> //
+                if(ar[ix].search(/-->/) > -1 || ar[ix].search(/\]>/) > -1) { 
+                    str += ar[ix];
+                    inComment = false; 
+                } else 
+                    // <elm></elm> //
+                    if( /^<\w/.exec(ar[ix-1]) && /^<\/\w/.exec(ar[ix]) &&
+                        /^<[\w:\-\.\,]+/.exec(ar[ix-1]) == /^<\/[\w:\-\.\,]+/.exec(ar[ix])[0].replace('/','')) { 
+                        str += ar[ix];
+                        if(!inComment) deep--;
+                    } else
+                        // <elm> //
+                        if(ar[ix].search(/<\w/) > -1 && ar[ix].search(/<\//) == -1 && ar[ix].search(/\/>/) == -1 ) {
+                            str = !inComment ? str += shift[deep++]+ar[ix] : str += ar[ix];
+                        } else 
+                            // <elm>...</elm> //
+                            if(ar[ix].search(/<\w/) > -1 && ar[ix].search(/<\//) > -1) {
+                                str = !inComment ? str += shift[deep]+ar[ix] : str += ar[ix];
+                            } else 
+                                // </elm> //
+                                if(ar[ix].search(/<\//) > -1) { 
+                                    str = !inComment ? str += shift[--deep]+ar[ix] : str += ar[ix];
+                                } else 
+                                    // <elm/> //
+                                    if(ar[ix].search(/\/>/) > -1 ) { 
+                                        str = !inComment ? str += shift[deep]+ar[ix] : str += ar[ix];
+                                    } else 
+                                        // <? xml ... ?> //
+                                        if(ar[ix].search(/<\?/) > -1) { 
+                                            str += shift[deep]+ar[ix];
+                                        } else 
+                                            // xmlns //
+                                            if( ar[ix].search(/xmlns\:/) > -1  || ar[ix].search(/xmlns\=/) > -1) { 
+                                                str += shift[deep]+ar[ix];
+                                            } 
+			
+                                            else {
+                                                str += ar[ix];
+                                            }
+        }
+		
+        return  (str[0] == '\n') ? str.slice(1) : str;
+    }
+
+    vkbeautify.prototype.json = function(text,step) {
+
+        var step = step ? step : this.step;
+	
+        if (typeof JSON === 'undefined' ) return text; 
+	
+        if ( typeof text === "string" ) return JSON.stringify(JSON.parse(text), null, step);
+        if ( typeof text === "object" ) return JSON.stringify(text, null, step);
+		
+        return text; // text is not string nor object
+    }
+
+    vkbeautify.prototype.css = function(text, step) {
+
+        var ar = text.replace(/\s{1,}/g,' ')
+                    .replace(/\{/g,"{~::~")
+                    .replace(/\}/g,"~::~}~::~")
+                    .replace(/\;/g,";~::~")
+                    .replace(/\/\*/g,"~::~/*")
+                    .replace(/\*\//g,"*/~::~")
+                    .replace(/~::~\s{0,}~::~/g,"~::~")
+                    .split('~::~'),
+            len = ar.length,
+            deep = 0,
+            str = '',
+            ix = 0,
+            shift = step ? createShiftArr(step) : this.shift;
+		
+        for(ix=0;ix<len;ix++) {
+
+            if( /\{/.exec(ar[ix]))  { 
+                str += shift[deep++]+ar[ix];
+            } else 
+                if( /\}/.exec(ar[ix]))  { 
+                    str += shift[--deep]+ar[ix];
+                } else
+                    if( /\*\\/.exec(ar[ix]))  { 
+                        str += shift[deep]+ar[ix];
+                    }
+                    else {
+                        str += shift[deep]+ar[ix];
+                    }
+        }
+        return str.replace(/^\n{1,}/,'');
+    }
+
+    //----------------------------------------------------------------------------
+
+    function isSubquery(str, parenthesisLevel) {
+        return  parenthesisLevel - (str.replace(/\(/g,'').length - str.replace(/\)/g,'').length )
+    }
+
+    function split_sql(str, tab) {
+
+        return str.replace(/\s{1,}/g," ")
+
+                    .replace(/ AND /ig,"~::~"+tab+tab+"AND ")
+                    .replace(/ BETWEEN /ig,"~::~"+tab+"BETWEEN ")
+                    .replace(/ CASE /ig,"~::~"+tab+"CASE ")
+                    .replace(/ ELSE /ig,"~::~"+tab+"ELSE ")
+                    .replace(/ END /ig,"~::~"+tab+"END ")
+                    .replace(/ FROM /ig,"~::~FROM ")
+                    .replace(/ GROUP\s{1,}BY/ig,"~::~GROUP BY ")
+                    .replace(/ HAVING /ig,"~::~HAVING ")
+                    //.replace(/ SET /ig," SET~::~")
+                    .replace(/ IN /ig," IN ")
+				
+                    .replace(/ JOIN /ig,"~::~JOIN ")
+                    .replace(/ CROSS~::~{1,}JOIN /ig,"~::~CROSS JOIN ")
+                    .replace(/ INNER~::~{1,}JOIN /ig,"~::~INNER JOIN ")
+                    .replace(/ LEFT~::~{1,}JOIN /ig,"~::~LEFT JOIN ")
+                    .replace(/ RIGHT~::~{1,}JOIN /ig,"~::~RIGHT JOIN ")
+				
+                    .replace(/ ON /ig,"~::~"+tab+"ON ")
+                    .replace(/ OR /ig,"~::~"+tab+tab+"OR ")
+                    .replace(/ ORDER\s{1,}BY/ig,"~::~ORDER BY ")
+                    .replace(/ OVER /ig,"~::~"+tab+"OVER ")
+
+                    .replace(/\(\s{0,}SELECT /ig,"~::~(SELECT ")
+                    .replace(/\)\s{0,}SELECT /ig,")~::~SELECT ")
+				
+                    .replace(/ THEN /ig," THEN~::~"+tab+"")
+                    .replace(/ UNION /ig,"~::~UNION~::~")
+                    .replace(/ USING /ig,"~::~USING ")
+                    .replace(/ WHEN /ig,"~::~"+tab+"WHEN ")
+                    .replace(/ WHERE /ig,"~::~WHERE ")
+                    .replace(/ WITH /ig,"~::~WITH ")
+				
+                    //.replace(/\,\s{0,}\(/ig,",~::~( ")
+                    //.replace(/\,/ig,",~::~"+tab+tab+"")
+
+                    .replace(/ ALL /ig," ALL ")
+                    .replace(/ AS /ig," AS ")
+                    .replace(/ ASC /ig," ASC ")	
+                    .replace(/ DESC /ig," DESC ")	
+                    .replace(/ DISTINCT /ig," DISTINCT ")
+                    .replace(/ EXISTS /ig," EXISTS ")
+                    .replace(/ NOT /ig," NOT ")
+                    .replace(/ NULL /ig," NULL ")
+                    .replace(/ LIKE /ig," LIKE ")
+                    .replace(/\s{0,}SELECT /ig,"SELECT ")
+                    .replace(/\s{0,}UPDATE /ig,"UPDATE ")
+                    .replace(/ SET /ig," SET ")
+							
+                    .replace(/~::~{1,}/g,"~::~")
+                    .split('~::~');
+    }
+
+    vkbeautify.prototype.sql = function(text,step) {
+
+        var ar_by_quote = text.replace(/\s{1,}/g," ")
+                                .replace(/\'/ig,"~::~\'")
+                                .split('~::~'),
+            len = ar_by_quote.length,
+            ar = [],
+            deep = 0,
+            tab = this.step,//+this.step,
+            inComment = true,
+            inQuote = false,
+            parenthesisLevel = 0,
+            str = '',
+            ix = 0,
+            shift = step ? createShiftArr(step) : this.shift;;
+
+        for(ix=0;ix<len;ix++) {
+            if(ix%2) {
+                ar = ar.concat(ar_by_quote[ix]);
+            } else {
+                ar = ar.concat(split_sql(ar_by_quote[ix], tab) );
+            }
+        }
+		
+        len = ar.length;
+        for(ix=0;ix<len;ix++) {
+			
+            parenthesisLevel = isSubquery(ar[ix], parenthesisLevel);
+			
+            if( /\s{0,}\s{0,}SELECT\s{0,}/.exec(ar[ix]))  { 
+                ar[ix] = ar[ix].replace(/\,/g,",\n"+tab+tab+"")
+            } 
+			
+            if( /\s{0,}\s{0,}SET\s{0,}/.exec(ar[ix]))  { 
+                ar[ix] = ar[ix].replace(/\,/g,",\n"+tab+tab+"")
+            } 
+			
+            if( /\s{0,}\(\s{0,}SELECT\s{0,}/.exec(ar[ix]))  { 
+                deep++;
+                str += shift[deep]+ar[ix];
+            } else 
+                if( /\'/.exec(ar[ix]) )  { 
+                    if(parenthesisLevel<1 && deep) {
+                        deep--;
+                    }
+                    str += ar[ix];
+                }
+                else  { 
+                    str += shift[deep]+ar[ix];
+                    if(parenthesisLevel<1 && deep) {
+                        deep--;
+                    }
+                } 
+            var junk = 0;
+        }
+
+        str = str.replace(/^\n{1,}/,'').replace(/\n{1,}/g,"\n");
+        return str;
+    }
+
+
+    vkbeautify.prototype.xmlmin = function(text, preserveComments) {
+
+        var str = preserveComments ? text
+                                   : text.replace(/\<![ \r\n\t]*(--([^\-]|[\r\n]|-[^\-])*--[ \r\n\t]*)\>/g,"")
+                                         .replace(/[ \r\n\t]{1,}xmlns/g, ' xmlns');
+        return  str.replace(/>\s{0,}</g,"><"); 
+    }
+
+    vkbeautify.prototype.jsonmin = function(text) {
+
+        if (typeof JSON === 'undefined' ) return text; 
+	
+        return JSON.stringify(JSON.parse(text), null, 0); 
+				
+    }
+
+    vkbeautify.prototype.cssmin = function(text, preserveComments) {
+	
+        var str = preserveComments ? text
+                                   : text.replace(/\/\*([^*]|[\r\n]|(\*+([^*/]|[\r\n])))*\*+\//g,"") ;
+
+        return str.replace(/\s{1,}/g,' ')
+                  .replace(/\{\s{1,}/g,"{")
+                  .replace(/\}\s{1,}/g,"}")
+                  .replace(/\;\s{1,}/g,";")
+                  .replace(/\/\*\s{1,}/g,"/*")
+                  .replace(/\*\/\s{1,}/g,"*/");
+    }
+
+    vkbeautify.prototype.sqlmin = function(text) {
+        return text.replace(/\s{1,}/g," ").replace(/\s{1,}\(/,"(").replace(/\s{1,}\)/,")");
+    }
+
+    window.vkbeautify = new vkbeautify();
+
+})();
+
diff --git a/WebApiTestClient/WebApiTestClient/WebApiTestClient.csproj b/WebApiTestClient/WebApiTestClient/WebApiTestClient.csproj
index d7a7855..fdeca43 100644
--- a/WebApiTestClient/WebApiTestClient/WebApiTestClient.csproj
+++ b/WebApiTestClient/WebApiTestClient/WebApiTestClient.csproj
@@ -1,68 +1,69 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-    <PropertyGroup>
-        <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-        <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-        <ProjectGuid>{55E16CDA-4832-43F8-822E-5BE81A9845C9}</ProjectGuid>
-        <OutputType>Library</OutputType>
-        <AppDesignerFolder>Properties</AppDesignerFolder>
-        <RootNamespace>WebApiTestClient</RootNamespace>
-        <AssemblyName>WebApiTestClient</AssemblyName>
-        <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-        <FileAlignment>512</FileAlignment>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-        <DebugSymbols>true</DebugSymbols>
-        <DebugType>full</DebugType>
-        <Optimize>false</Optimize>
-        <OutputPath>bin\Debug\</OutputPath>
-        <DefineConstants>DEBUG;TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-        <DebugType>pdbonly</DebugType>
-        <Optimize>true</Optimize>
-        <OutputPath>bin\Release\</OutputPath>
-        <DefineConstants>TRACE</DefineConstants>
-        <ErrorReport>prompt</ErrorReport>
-        <WarningLevel>4</WarningLevel>
-    </PropertyGroup>
-    <ItemGroup>
-        <Reference Include="System" />
-        <Reference Include="System.Core" />
-        <Reference Include="System.Xml.Linq" />
-        <Reference Include="System.Data.DataSetExtensions" />
-        <Reference Include="Microsoft.CSharp" />
-        <Reference Include="System.Data" />
-        <Reference Include="System.Xml" />
-    </ItemGroup>
-    <ItemGroup>
-        <None Include="Areas\HelpPage\Views\Help\DisplayTemplates\TestClientDialogs.cshtml.pp" />
-        <None Include="Areas\HelpPage\Views\Help\DisplayTemplates\TestClientReferences.cshtml" />
-        <None Include="WebApiTestClient.nuspec">
-            <SubType>Designer</SubType>
-        </None>
-    </ItemGroup>
-    <ItemGroup>
-        <Content Include="Areas\HelpPage\TestClient.css" />
-        <Content Include="Scripts\WebApiTestClient.js" />
-    </ItemGroup>
-    <ItemGroup>
-        <Folder Include="Properties\" />
-    </ItemGroup>
-    <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-    <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{55E16CDA-4832-43F8-822E-5BE81A9845C9}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>WebApiTestClient</RootNamespace>
+    <AssemblyName>WebApiTestClient</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="Areas\HelpPage\Views\Help\DisplayTemplates\TestClientDialogs.cshtml.pp" />
+    <None Include="Areas\HelpPage\Views\Help\DisplayTemplates\TestClientReferences.cshtml" />
+    <None Include="WebApiTestClient.nuspec">
+      <SubType>Designer</SubType>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="Areas\HelpPage\TestClient.css" />
+    <Content Include="Scripts\vkbeautify.js" />
+    <Content Include="Scripts\WebApiTestClient.js" />
+  </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Properties\" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
   </Target>
 
   -->
-    <Target Name="AfterBuild">
-        <Exec Command="$(SolutionDir).nuget\nuget.exe pack $(ProjectDir)WebApiTestClient.nuspec -OutputDirectory $(OutputPath)" />
-    </Target>
-    <Target Name = "Clean">
-        <RemoveDir Directories="$(OutputPath)" />
-    </Target>
+  <Target Name="AfterBuild">
+    <Exec Command="$(SolutionDir).nuget\nuget.exe pack $(ProjectDir)WebApiTestClient.nuspec -OutputDirectory $(OutputPath)" />
+  </Target>
+  <Target Name="Clean">
+    <RemoveDir Directories="$(OutputPath)" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/WebApiTestClient/WebApiTestClient/WebApiTestClient.nuspec b/WebApiTestClient/WebApiTestClient/WebApiTestClient.nuspec
index 54804de..53592b0 100644
--- a/WebApiTestClient/WebApiTestClient/WebApiTestClient.nuspec
+++ b/WebApiTestClient/WebApiTestClient/WebApiTestClient.nuspec
@@ -22,5 +22,6 @@
         <file src="Areas\HelpPage\Views\Help\DisplayTemplates\TestClientReferences.cshtml" target="content\Areas\HelpPage\Views\Help\DisplayTemplates\TestClientReferences.cshtml" />
         <file src="Areas\HelpPage\TestClient.css" target="content\Areas\HelpPage\TestClient.css" />
         <file src="Scripts\WebApiTestClient.js" target="content\Scripts\WebApiTestClient.js" />
+        <file src="Scripts\vkbeautify.js" target="content\Scripts\vkbeautify.js" />
     </files>
 </package>
\ No newline at end of file