diff --git a/src/main/resources/com/checkpoint/mgmt_api/templates/index.tpl.html b/src/main/resources/com/checkpoint/mgmt_api/templates/index.tpl.html
index 8fe78b8..5e55438 100644
--- a/src/main/resources/com/checkpoint/mgmt_api/templates/index.tpl.html
+++ b/src/main/resources/com/checkpoint/mgmt_api/templates/index.tpl.html
@@ -1,245 +1,246 @@
 <!DOCTYPE html>
 <html>
-	<head>
-		<title>Page Title</title>
-		<style>
-		body {
-			font-family: "Helvetica";
-		}
-
-		table {
-			border-collapse: collapse;
-			border : 1px solid gray;
-			font-size : 80%;
-		}
-
-		td {
-			vertical-align: text-top;
-			padding : 6px;
-			border : 1px solid gray;
-		}
-
-		th {
-			vertical-align: text-top;
-			padding : 6px;
-			border : 1px solid gray;
-			background-color: rgb(87,99,114);
-			font-weight : bold;
-			color : white;
-		}
-
-		.topic {
-			background-color: rgb(87,99,114);
-			font-weight : bold;
-			color : white;
-		}
-
-		.object_link {
-			text-decoration: none;
-			color: blue;
-		}
-
-		.object_link:hover {
-			text-decoration: underline;
-		}
-
-	
-		.disabled_rule .object_link {
-			color: darkgray;
-		}
-
-
-		</style>
-		<script>
-			// this part of the page is generated dynamically in the Java code by using the Check Point management APIs
-
-            /*<%%>*/
-
-			// end of dynamic content
-		</script>
-		<script>
-			function drawTableColumnHeaders() {
-				var headerRow = document.getElementById("table_header_row");
-
-				var th = document.createElement("th");
-				th.appendChild(document.createTextNode(""));
-				headerRow.appendChild(th);					
-
-				data.policyPackages.forEach(function(entry){
-					var th = document.createElement("th");
-				    th.appendChild(document.createTextNode(entry.packageName));
-					headerRow.appendChild(th);					
-				});
-			}
-
-			function drawLink (entry) {
-				var divElem = document.createElement("div");
-				var linkElem = document.createElement("a");
-				linkElem.className = "object_link";
-				linkElem.setAttribute("href", "./" + entry.htmlFileName);
-				linkElem.setAttribute("target", "_blank");
-				if (entry.domain != "Management server") {
-					linkElem.appendChild(document.createTextNode(entry.domain + " > " + entry.name));
-				}
-				else {
-					linkElem.appendChild(document.createTextNode(entry.name));
-				}
-				
-				divElem.appendChild(linkElem);
-				return divElem;
-			}
-			
-			function drawGatewayLink(htmlFileName, entry) {
-				var divElem = document.createElement("div");
-				var linkElem = document.createElement("a");
-				linkElem.className = "object_link";
-				linkElem.setAttribute("href", "./" + htmlFileName + "?uid=" + entry.uid);
-				linkElem.setAttribute("target", "_blank");
-				linkElem.appendChild(document.createTextNode(entry.name));
-				divElem.appendChild(linkElem);
-				return divElem;
-			}
-			
-			function drawObjectLink(entry) {
-				var divElem = document.createElement("div");
-				var linkElem = document.createElement("a");
-				linkElem.className = "object_link";
-				linkElem.setAttribute("href", "./" + entry["filename"] + "?type=" + entry.type);
-				linkElem.setAttribute("target", "_blank");
-				linkElem.appendChild(document.createTextNode(entry.type + " (" + entry.value +")"));
-				divElem.appendChild(linkElem);
-				return divElem;
-			}
-			
-			function drawTopic(topicName, topicDescription) {
-				var table = document.getElementById("table_body");
-				var row = document.createElement("tr");
-				var td_topic = document.createElement("td");
-				td_topic.appendChild(document.createTextNode(topicDescription));
-				td_topic.className = "topic";
-				row.appendChild(td_topic);
-				data.policyPackages.forEach(function(entry){
-					if (entry[topicName].constructor === Array) {
-						var td = document.createElement("td");
-						entry[topicName].forEach(function (subEntry){
-							td.appendChild(drawLink(subEntry));
-						});
-						row.appendChild(td);					
-					}
-					else
-					{
-						var td = document.createElement("td");
-						td.appendChild(drawLink(entry[topicName]));
-						row.appendChild(td);					
-					}
-				});
-				table.appendChild(row);
-			}
-
-			function drawGateways() {
-				var table = document.getElementById("table_body");
-				var row = document.createElement("tr");
-				var td_topic = document.createElement("td");
-				td_topic.appendChild(document.createTextNode("Gateways running this policy package"));
-				td_topic.className = "topic";
-				row.appendChild(td_topic);
-				data.policyPackages.forEach(function(policPackage){
-					var td = document.createElement("td");
-					policPackage["gatewayAndServerList"].forEach(function (gwEntry){
-						td.appendChild(drawGatewayLink(policPackage["htmlGatewaysFileName"],gwEntry));
-					});
-					row.appendChild(td);					
-				});
-				table.appendChild(row);
-			}
-			
-			function drawObjects() {
-				var table = document.getElementById("table_body");
-				var row = document.createElement("tr");
-				var td_topic = document.createElement("td");
-				td_topic.appendChild(document.createTextNode("Objects"));
-				td_topic.className = "topic";
-				row.appendChild(td_topic);
-				var objects = {};
-				var all_keys = [];
-				
-				data.policyPackages.forEach(function(policPackage){
-					for (var key in policPackage["objects"]["types"]) {
-						if (!(key in objects)) {
-							objects[key] = [];
-							all_keys.push(key);
-						}
-						var objData = {"packageName" : policPackage["packageName"], "filename" : policPackage["objects"]["htmlObjectsFileName"], "type" : key, "value" : policPackage["objects"]["types"][key]};
-						objects[key].push(objData);
-					}
-				});
-				
-				all_keys.sort( function(a, b) {
-					if (a.toLowerCase() < b.toLowerCase()) return -1;
-					if (a.toLowerCase() > b.toLowerCase()) return 1;
-					return 0;
-				});
-				
-				data.policyPackages.forEach(function(policPackage){
-					var td = document.createElement("td");
-					for (var i=0; i<all_keys.length; i++) {
-						var key = all_keys[i];
-
-						//If the curernt object type doesn't belong to this package, don't show it.
-                        if (Object.keys(policPackage["objects"]["types"]).indexOf(key) == -1) {
-                            continue;
+<head>
+    <title>Page Title</title>
+    <style>
+        body {
+            font-family: "Helvetica", sans-serif;
+        }
+
+        table {
+            border-collapse: collapse;
+            border: 1px solid gray;
+            font-size: 80%;
+        }
+
+        td {
+            vertical-align: text-top;
+            padding: 6px;
+            border: 1px solid gray;
+        }
+
+        th {
+            vertical-align: text-top;
+            padding: 6px;
+            border: 1px solid gray;
+            background-color: rgb(87, 99, 114);
+            font-weight: bold;
+            color: white;
+        }
+
+        .topic {
+            background-color: rgb(87, 99, 114);
+            font-weight: bold;
+            color: white;
+        }
+
+        .object_link {
+            text-decoration: none;
+            color: blue;
+        }
+
+        .object_link:hover {
+            text-decoration: underline;
+        }
+
+        .disabled_rule .object_link {
+            color: darkgray;
+        }
+    </style>
+
+    <script>
+        // this part of the page is generated dynamically in the Java code by using the Check Point management APIs
+
+        /*<%%>*/
+
+        // end of dynamic content
+    </script>
+
+    <script>
+        function drawTableColumnHeaders() {
+            var headerRow = document.getElementById("table_header_row");
+
+            var th = document.createElement("th");
+            th.appendChild(document.createTextNode(""));
+            headerRow.appendChild(th);
+
+            data.policyPackages.forEach(function (entry) {
+                var th = document.createElement("th");
+                th.appendChild(document.createTextNode(entry.packageName));
+                headerRow.appendChild(th);
+            });
+        }
+
+        function drawLink(entry) {
+            var divElem = document.createElement("div");
+            var linkElem = document.createElement("a");
+            linkElem.className = "object_link";
+            linkElem.setAttribute("href", "./" + entry.htmlFileName);
+            linkElem.setAttribute("target", "_blank");
+            if (entry.domain != "Management server") {
+                linkElem.appendChild(document.createTextNode(entry.domain + " > " + entry.name));
+            }
+            else {
+                linkElem.appendChild(document.createTextNode(entry.name));
+            }
+
+            divElem.appendChild(linkElem);
+            return divElem;
+        }
+
+        function drawGatewayLink(htmlFileName, entry) {
+            var divElem = document.createElement("div");
+            var linkElem = document.createElement("a");
+            linkElem.className = "object_link";
+            linkElem.setAttribute("href", "./" + htmlFileName + "?uid=" + entry.uid);
+            linkElem.setAttribute("target", "_blank");
+            linkElem.appendChild(document.createTextNode(entry.name));
+            divElem.appendChild(linkElem);
+            return divElem;
+        }
+
+        function drawObjectLink(entry) {
+            var divElem = document.createElement("div");
+            var linkElem = document.createElement("a");
+            linkElem.className = "object_link";
+            linkElem.setAttribute("href", "./" + entry["filename"] + "?type=" + entry.type);
+            linkElem.setAttribute("target", "_blank");
+            linkElem.appendChild(document.createTextNode(entry.type + " (" + entry.value + ")"));
+            divElem.appendChild(linkElem);
+            return divElem;
+        }
+
+        function drawTopic(topicName, topicDescription) {
+            var table = document.getElementById("table_body");
+            var row = document.createElement("tr");
+            var td_topic = document.createElement("td");
+            td_topic.appendChild(document.createTextNode(topicDescription));
+            td_topic.className = "topic";
+            row.appendChild(td_topic);
+            data.policyPackages.forEach(function (entry) {
+                var td = document.createElement("td");
+
+                if (entry[topicName].constructor === Array) {
+                    entry[topicName].forEach(function (subEntry) {
+                        td.appendChild(drawLink(subEntry));
+                    });
+                }
+                else {
+                    td.appendChild(drawLink(entry[topicName]));
+                }
+
+                row.appendChild(td);
+            });
+            table.appendChild(row);
+        }
+
+        function drawGateways() {
+            var table = document.getElementById("table_body");
+            var row = document.createElement("tr");
+            var td_topic = document.createElement("td");
+            td_topic.appendChild(document.createTextNode("Gateways running this policy package"));
+            td_topic.className = "topic";
+            row.appendChild(td_topic);
+            data.policyPackages.forEach(function (policPackage) {
+                var td = document.createElement("td");
+                policPackage["gatewayAndServerList"].forEach(function (gwEntry) {
+                    td.appendChild(drawGatewayLink(policPackage["htmlGatewaysFileName"], gwEntry));
+                });
+                row.appendChild(td);
+            });
+            table.appendChild(row);
+        }
+
+        function drawObjects() {
+            var table = document.getElementById("table_body");
+            var row = document.createElement("tr");
+            var td_topic = document.createElement("td");
+            td_topic.appendChild(document.createTextNode("Objects"));
+            td_topic.className = "topic";
+            row.appendChild(td_topic);
+            var objects = {};
+            var all_keys = [];
+
+            data.policyPackages.forEach(function (policPackage) {
+                for (var key in policPackage["objects"]["types"]) {
+                    if (!(key in objects)) {
+                        objects[key] = [];
+                        all_keys.push(key);
+                    }
+                    var objData = {
+                        "packageName": policPackage["packageName"],
+                        "filename": policPackage["objects"]["htmlObjectsFileName"],
+                        "type": key,
+                        "value": policPackage["objects"]["types"][key]
+                    };
+                    objects[key].push(objData);
+                }
+            });
+
+            all_keys.sort(function (a, b) {
+                if (a.toLowerCase() < b.toLowerCase()) return -1;
+                if (a.toLowerCase() > b.toLowerCase()) return 1;
+                return 0;
+            });
+
+            data.policyPackages.forEach(function (policPackage) {
+                var td = document.createElement("td");
+                for (var i = 0; i < all_keys.length; i++) {
+                    var key = all_keys[i];
+
+                    //If the curernt object type doesn't belong to this package, don't show it.
+                    if (Object.keys(policPackage["objects"]["types"]).indexOf(key) === -1) {
+                        continue;
+                    }
+
+                    var found = false;
+                    objects[key].forEach(function (objData) {
+                        if (policPackage["packageName"] == objData["packageName"]) {
+                            found = true;
+                            td.appendChild(drawObjectLink(objData));
                         }
-
-						var found = false;
-						objects[key].forEach(function (objData) {
-							if (policPackage["packageName"] == objData["packageName"]) {
-								found = true;
-								td.appendChild(drawObjectLink(objData));
-							}
-						});
-						if (!found) {
-							var divElem = document.createElement("div");
-							divElem.appendChild(document.createTextNode(key + " (0)"));
-							td.appendChild(divElem);
-						}
-					}
-					row.appendChild(td);
-				});
-				table.appendChild(row);
-			}
-			
-			
-			function drawIndex() {
-				document.title = "Show Package"
-				if (data.domain !="" ) {
-					document.getElementById("domain").innerHTML = "Domain: "+ data.domain;
-				}
-				drawTableColumnHeaders();
-				drawTopic("accessLayers", "Access Policy Layers");
-				drawTopic("natLayer", "NAT");
-				drawTopic("threatLayers", "Threat Prevention Layers");
-				drawGateways();
-				drawObjects();
-				
-			}
-			
-		
-		</script>
-	</head>
-	
-	<body onload="drawIndex()">
-	  <h3>
-	     <div id="domain"></div>
-	  </h3>
-	  
-	  <table>
-		<thead>
-		  <tr id="table_header_row">
-		  <tr>
-		</thead>
-		<tbody id="table_body">
-		</tbody>
-	  </table>
-	</body>
+                    });
+                    if (!found) {
+                        var divElem = document.createElement("div");
+                        divElem.appendChild(document.createTextNode(key + " (0)"));
+                        td.appendChild(divElem);
+                    }
+                }
+                row.appendChild(td);
+            });
+            table.appendChild(row);
+        }
+
+        function drawIndex() {
+            document.title = "Show Package";
+            if (data.domain) {
+                document.getElementById("domain").innerHTML = "Domain: " + data.domain;
+            }
+            drawTableColumnHeaders();
+            drawTopic("accessLayers", "Access Policy Layers");
+            drawTopic("natLayer", "NAT");
+            drawTopic("threatLayers", "Threat Prevention Layers");
+            drawGateways();
+            drawObjects();
+
+        }
+    </script>
+
+</head>
+
+<body onload="drawIndex()">
+    <h3>
+        <div id="domain"></div>
+    </h3>
+
+    <table>
+        <thead>
+            <tr id="table_header_row">
+            <tr>
+        </thead>
+        <tbody id="table_body">
+        </tbody>
+    </table>
+</body>
 </html>
 
diff --git a/src/main/resources/com/checkpoint/mgmt_api/templates/objects.tpl.html b/src/main/resources/com/checkpoint/mgmt_api/templates/objects.tpl.html
index deac856..d8c281d 100644
--- a/src/main/resources/com/checkpoint/mgmt_api/templates/objects.tpl.html
+++ b/src/main/resources/com/checkpoint/mgmt_api/templates/objects.tpl.html
@@ -4,46 +4,46 @@
     <title>Page Title</title>
     <style>
         body {
-            font-family: "Helvetica";
+            font-family: "Helvetica", sans-serif;
         }
 
         table {
             border-collapse: collapse;
-            font-family: "Courier";
-            border-style: hidden ;
-            width : 100%;
+            font-family: "Courier", monospace;
+            border-style: hidden;
+            width: 100%;
         }
 
         td {
-            border : 1px solid Gray;
+            border: 1px solid Gray;
             vertical-align: text-top;
-            padding : 6px;
+            padding: 6px;
         }
 
         .key {
-            color : DarkRed;
+            color: DarkRed;
             font-weight: bold;
         }
 
         .number_value {
-            color : DarkBlue;
+            color: DarkBlue;
         }
 
         .string_value {
-            color : Blue;
+            color: Blue;
         }
 
         .object_value {
-            padding: 0px;
+            padding: 0;
         }
 
         .array_item {
-            color : Green;
+            color: Green;
         }
 
         .main_table {
-            border : 1px solid gray;
-            width : auto;
+            border: 1px solid gray;
+            width: auto;
         }
 
         .object_link {
@@ -54,8 +54,8 @@
         .object_link:hover {
             text-decoration: underline;
         }
-
     </style>
+
     <script>
         // this part of the page is generated dynamically in the Java code by using the Check Point management APIs
 
@@ -63,6 +63,7 @@
 
         // end of dynamic content
     </script>
+
     <script>
         var objectsMap = {};
 
@@ -72,10 +73,10 @@
 
         function filterObjects(arr) {
             var queryParams = getQueryParams();
-            return arr.filter(function(obj) {
+            return arr.filter(function (obj) {
                 var keep = true;
-                if ( ("type" in obj) && ("type" in queryParams) ) keep = (queryParams["type"] === obj["type"]);
-                if ( (keep) && ("uid" in obj) && ("uid" in queryParams) ) keep = (queryParams["uid"] === obj["uid"]);
+                if (("type" in obj) && ("type" in queryParams)) keep = (queryParams["type"] === obj["type"]);
+                if ((keep) && ("uid" in obj) && ("uid" in queryParams)) keep = (queryParams["uid"] === obj["uid"]);
                 return keep;
             });
         }
@@ -88,10 +89,16 @@
             });
 
             var filteredObjects = filterObjects(data);
-            objects = filteredObjects.sort(function(a,b) {
-                if(a.type == null && b.type == null){ return 0}
-                if(a.type == null){ return 1}
-                if(b.type == null){ return -1}
+            objects = filteredObjects.sort(function (a, b) {
+                if (a.type == null && b.type == null) {
+                    return 0
+                }
+                if (a.type == null) {
+                    return 1
+                }
+                if (b.type == null) {
+                    return -1
+                }
                 return (a.type).localeCompare(b.type);
             });
         }
@@ -107,11 +114,11 @@
                 parentObject.appendChild(document.createTextNode(" [Empty array]"));
             }
             var tableElement = document.createElement("table");
-            arr.forEach(function(elem, index) {
+            arr.forEach(function (elem, index) {
                 var rowElement = document.createElement("tr");
                 var indexElement = document.createElement("td");
                 indexElement.className = "array_item";
-                indexElement.appendChild(document.createTextNode("#"+index.toString()));
+                indexElement.appendChild(document.createTextNode("#" + index.toString()));
                 rowElement.appendChild(indexElement);
 
                 var valueElement = document.createElement("td");
@@ -139,7 +146,7 @@
                 var bb = keysOrderArray.indexOf(b);
                 return aa !== -1 && bb !== -1 && aa - bb || aa !== -1 && -1 || bb !== -1 && 1 || a.localeCompare(b);
             }).forEach(function (key) {
-                 var rowElement = document.createElement("tr");
+                var rowElement = document.createElement("tr");
                 var keyElement = document.createElement("td");
                 keyElement.className = "key";
                 keyElement.appendChild(document.createTextNode(key + ":"));
@@ -155,8 +162,8 @@
             parentObject.appendChild(tableElement);
         }
 
-        function printChildElement (elem, parent, level) {
-            switch (Object.prototype.toString.call((elem))){
+        function printChildElement(elem, parent, level) {
+            switch (Object.prototype.toString.call((elem))) {
                 case "[object Object]":
                     parent.className = "object_value";
                     printObject(elem, parent, level + 1);
@@ -190,8 +197,7 @@
             document.title = "Package Objects";
             var previousType = "";
             objects.forEach(function (obj) {
-                if (obj.type !== previousType)
-                {
+                if (obj.type !== previousType) {
                     printHeadline(obj.type);
                 }
 
@@ -205,13 +211,13 @@
 
         var isUUID = function () {
             var uuidRegEx = RegExp("^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$", "i");
-            return function(str) {
+            return function (str) {
                 return uuidRegEx.test(str);
             }
         }();
 
         var getLinkBase = function () {
-            var linkBase = "./" + document.location.pathname.split("/").splice(-1,1) + "?uid=";
+            var linkBase = "./" + document.location.pathname.split("/").splice(-1, 1) + "?uid=";
             return function () {
                 return linkBase;
             }
@@ -246,8 +252,8 @@
             }
             return valueNode;
         }
-
     </script>
+
 </head>
 
 <body onload="printAllObjects()">
diff --git a/src/main/resources/com/checkpoint/mgmt_api/templates/rulebase.tpl.html b/src/main/resources/com/checkpoint/mgmt_api/templates/rulebase.tpl.html
index 42cf549..31c7d19 100644
--- a/src/main/resources/com/checkpoint/mgmt_api/templates/rulebase.tpl.html
+++ b/src/main/resources/com/checkpoint/mgmt_api/templates/rulebase.tpl.html
@@ -1,664 +1,646 @@
-
 <!DOCTYPE html>
 <html>
-	<head>
-		<title>Page Title</title>
-		<style>
-		body {
-			font-family: "Helvetica";
-		}
-
-		table {
-			border-collapse: collapse;
-			border : 1px solid gray;
-			font-size : 80%;
-		}
-
-		td {
-			vertical-align: text-top;
-			padding : 6px;
-			border : 1px solid gray;
-			white-space: nowrap;
-		}
-
-		th {
-			vertical-align: text-top;
-			padding : 6px;
-			border : 1px solid gray;
-			background-color: rgb(87,99,114);
-			font-weight : bold;
-			color : white;
-		}
-
-		.rule_number {
-			background-color: rgb(240,240,240);
-			text-align: right;
-		}
-
-		.placeholder_number {
-			background-color: rgb(226,240,254);
-			text-align: right;
-		}
-
-		.disabled_rule {
-			color: lightgray;
-		}
-
-		.disabled_rule .rule_number:after {
-			content: "\A[Disabled]";
-			display: block;
-		}
-
-		.negate:before {
-			content: "---Negated---\A";
-			display: block;
-			color: red;
-		}
-
-		.negate:after {
-			content: "------------------";
-			display: block;
-			color: red;
-		}
-
-		.section {
-			background-color: rgb(255,249,178);
-		}
-
-		.placeholder {
-			background-color: rgb(229,242,253);
-		}
-
-		.object_link {
-			text-decoration: none;
-			color: blue;
-		}
-
-		.object_link:hover {
-			text-decoration: underline;
-		}
-
-
-		.disabled_rule .object_link {
-			color: darkgray;
-		}
-
-		.toggle > .toggle-button {
-			margin-left: 5px;
-		}
-
-		.toggle:not(.open) > .toggle-content {
-		  display: none;
-		}
-
-		.toggle:not(.open) > .toggle-button:after {
-		  content: "+";
-		  color: blue;
-		}
-
-		.toggle.open > .toggle-button:after {
-		  content: "-";
-		  color: blue;
-		}
-
-		.toggle-button {
-		  cursor: pointer;
-		}
-
-       .failed{
-         color: red;
-       }
-
-       .empty{
-          color: blue;
-        }
-
-
-		</style>
-		<script>
-            // this part of the page is generated dynamically in the Java code by using the Check Point management APIs
-
-			/*<%%>*/
-
-			// end of dynamic content
-
-			var firstAccessRule = data.find(function(e) {return e.type === "access-rule"});
-			var showHitCount = !!(firstAccessRule && firstAccessRule.hits);
-		</script>
-		<script>
-			var accessColumnHeaders = ["No.","Name", "Source", "Destination", "VPN", "Service/Application", getDataHeader(), "Action", "Track", "Time", "Install-On", "Comments"];
-			if (showHitCount) {
-				accessColumnHeaders.splice(1, 0, "Hits");
-			}
-			var natColumnHeaders = ["No.","Original Source", "Original Destination", "Original Services", "Translated Source", "Translated Destination", "Translated Services",  "Install-On", "Comments"];
-			var threatColumnHeaders = ["No.", "Name", "Protected Scope", "Source", "Destination", "Protection/Site", "Services", "Action","Track", "install-On", "Comments"];
-
-			var columnHeaders;
-			function getOptionalTextValue(elem, key) {
-				if (key in elem) return elem[key];
-				return "\u00A0"; // return non-breaking space
-			}
-
-			function drawSection(sectionObject, columns, parentRulePrefix) {
-				var tr = document.createElement("tr");
-				var td = document.createElement("td");
-				var td_text = "";
-				if ("name" in sectionObject) {
-					td_text = sectionObject["name"];
-				}
-				else {
-					td_text = "New Section";
-				}
-
-				if (sectionObject["from"] && sectionObject["to"]) {
-				    td_text += " (" + parentRulePrefix + sectionObject["from"] + "-" + parentRulePrefix + sectionObject["to"] + ")";
-				} else {
-				    td_text += " (No Rules)";
-				}
-
-				td.className = "section";
-				td.setAttribute("colSpan", columns.length);
-				td.appendChild(document.createTextNode(td_text));
-				tr.appendChild(td);
-				return tr;
-			}
-
-
-			function drawPlaceholder(placeholderObj) {
-				var tr = document.createElement("tr");
-				var td_number = document.createElement("td");
-				td_number.className = "placeholder_number";
-				td_number.appendChild(document.createTextNode(placeholderObj["rule-number"]));
-				var td_title = document.createElement("td");
-				var td_text = "Placeholder for domain rules";
-				td_title.className = "placeholder";
-				td_title.setAttribute("colSpan", accessColumnHeaders.length-1);
-				td_title.appendChild(document.createTextNode(td_text));
-				tr.appendChild(td_number);
-				tr.appendChild(td_title);
-				return tr;
-			}
-
-			function drawTextCell(fieldObject, key) {
-				var td = document.createElement("td");
-				td.appendChild(document.createTextNode(getOptionalTextValue(fieldObject, key)));
-				return td;
-			}
-
-			function drawItem(id, name, objectsPage) {
-				// TODO add more words
-				if (id == null)	{
-					name = "N/A";
-				}
-				var reservedWords = ["Any", "Policy Targets", "Accept", "Drop", "Reject","None", "Full Log", "Inner Layer","Network Log", "N/A"];
-				var divElem = document.createElement("div");
-
-
-				if (reservedWords.indexOf(name) >= 0  ) {
-					divElem.appendChild(document.createTextNode(name));
-				}
-				else {
-					var linkElem = document.createElement("a");
-					linkElem.className = "object_link";
-					linkElem.setAttribute("href", "./" + objectsPage + "?uid=" + id);
-					linkElem.setAttribute("target", "_blank");
-					linkElem.appendChild(document.createTextNode(name));
-					divElem.appendChild(linkElem);
-				}
-				return divElem;
-			}
-
-
-			function drawSingleValueCell(id) {
-				var td = document.createElement("td");
-				var obj_name = uid_to_name[id];
-				td.appendChild(drawItem(id, obj_name, rulebase.package+"_objects.html"));
-				return td;
-			}
-
-			function drawMultiValueCell(fieldObject, isNegated) {
-				var td = document.createElement("td");
-				if (isNegated) {
-					td.className = "negate";
-				}
-				fieldObject.forEach(function (obj_uid) {
-					var obj_name = uid_to_name[obj_uid];
-					td.appendChild(drawItem(obj_uid, obj_name, rulebase.package+"_objects.html"));
-				});
-				return td;
-			}
-
-			function drawSingleValueCell(id) {
-                var td = document.createElement("td");
-                var obj_name = uid_to_name[id];
-                td.appendChild(drawItem(id, obj_name, rulebase.package+"_objects.html"));
-                return td;
+<head>
+    <title>Page Title</title>
+    <style>
+        body {
+            font-family: "Helvetica", sans-serif;
+        }
+
+        table {
+            border-collapse: collapse;
+            border: 1px solid gray;
+            font-size: 80%;
+        }
+
+        td {
+            vertical-align: text-top;
+            padding: 6px;
+            border: 1px solid gray;
+            white-space: nowrap;
+        }
+
+        th {
+            vertical-align: text-top;
+            padding: 6px;
+            border: 1px solid gray;
+            background-color: rgb(87, 99, 114);
+            font-weight: bold;
+            color: white;
+        }
+
+        .rule_number {
+            background-color: rgb(240, 240, 240);
+            text-align: right;
+        }
+
+        .placeholder_number {
+            background-color: rgb(226, 240, 254);
+            text-align: right;
+        }
+
+        .disabled_rule {
+            color: lightgray;
+        }
+
+        .disabled_rule .rule_number:after {
+            content: "\A[Disabled]";
+            display: block;
+        }
+
+        .negate:before {
+            content: "---Negated---\A";
+            display: block;
+            color: red;
+        }
+
+        .negate:after {
+            content: "------------------";
+            display: block;
+            color: red;
+        }
+
+        .section {
+            background-color: rgb(255, 249, 178);
+        }
+
+        .placeholder {
+            background-color: rgb(229, 242, 253);
+        }
+
+        .object_link {
+            text-decoration: none;
+            color: blue;
+        }
+
+        .object_link:hover {
+            text-decoration: underline;
+        }
+
+        .disabled_rule .object_link {
+            color: darkgray;
+        }
+
+        .toggle > .toggle-button {
+            margin-left: 5px;
+        }
+
+        .toggle:not(.open) > .toggle-content {
+            display: none;
+        }
+
+        .toggle:not(.open) > .toggle-button:after {
+            content: "+";
+            color: blue;
+        }
+
+        .toggle.open > .toggle-button:after {
+            content: "-";
+            color: blue;
+        }
+
+        .toggle-button {
+            cursor: pointer;
+        }
+
+        .failed {
+            color: red;
+        }
+
+        .empty {
+            color: blue;
+        }
+    </style>
+
+    <script>
+        // this part of the page is generated dynamically in the Java code by using the Check Point management APIs
+
+        /*<%%>*/
+
+        // end of dynamic content
+
+        var firstAccessRule = data.find(function (e) {
+            return e.type === "access-rule"
+        });
+        var showHitCount = !!(firstAccessRule && firstAccessRule.hits);
+    </script>
+
+    <script>
+        var accessColumnHeaders = ["No.", "Name", "Source", "Destination", "VPN", "Service/Application", getDataHeader(), "Action", "Track", "Time", "Install-On", "Comments"];
+        if (showHitCount) {
+            accessColumnHeaders.splice(1, 0, "Hits");
+        }
+        var natColumnHeaders = ["No.", "Original Source", "Original Destination", "Original Services", "Translated Source", "Translated Destination", "Translated Services", "Install-On", "Comments"];
+        var threatColumnHeaders = ["No.", "Name", "Protected Scope", "Source", "Destination", "Protection/Site", "Services", "Action", "Track", "install-On", "Comments"];
+
+        var columnHeaders;
+
+        function getOptionalTextValue(elem, key) {
+            if (key in elem) return elem[key];
+            return "\u00A0"; // return non-breaking space
+        }
+
+        function drawSection(sectionObject, columns, parentRulePrefix) {
+            var tr = document.createElement("tr");
+            var td = document.createElement("td");
+            var td_text = "";
+            if ("name" in sectionObject) {
+                td_text = sectionObject["name"];
+            }
+            else {
+                td_text = "New Section";
             }
 
-            function drawMultiValueCell(fieldObject, isNegated) {
-                var td = document.createElement("td");
-                if (isNegated) {
-                    td.className = "negate";
-                }
-                fieldObject.forEach(function (obj_uid) {
-                    var obj_name = uid_to_name[obj_uid];
-                    td.appendChild(drawItem(obj_uid, obj_name, rulebase.package+"_objects.html"));
-                });
-                return td;
+            if (sectionObject["from"] && sectionObject["to"]) {
+                td_text += " (" + parentRulePrefix + sectionObject["from"] + "-" + parentRulePrefix + sectionObject["to"] + ")";
+            } else {
+                td_text += " (No Rules)";
             }
 
-             function drawTrackValueCell(object){
-                   var td = document.createElement("td");
-                   if (isApiVersionNew() && object["track"]){
-                       var setting = object["track"];
-                       var obj_name = uid_to_name[setting["type"]];
-                       var item = drawItem(setting["type"], obj_name, rulebase.package+"_objects.html");
-                       td.appendChild(item);
-
-                       if (setting["per-session"]  || setting["per-connection"] || setting["accounting"] || setting["alert"] != "none"){
-                           item.className = "toggle";
-                           var button = document.createElement("span");
-                           button.className = "toggle-button";
-
-                           item.appendChild(button);
-
-                           var content = document.createElement("div");
-                           content.className = "toggle-content";
-                           item.appendChild(content);
-
-                           if (setting["per-session"]){
-                               var newEl = document.createElement("div");
-                               newEl.appendChild(document.createTextNode("per-session"));
-                               content.appendChild(newEl);
-                           }
-                            if (setting["per-connection"]){
-                               var newEl = document.createElement("div");
-                               newEl.appendChild(document.createTextNode("per-connection"));
-                               content.appendChild(newEl);
-                           }
-                            if (setting["accounting"]){
-                               var newEl = document.createElement("div");
-                               newEl.appendChild(document.createTextNode("accounting"));
-                               content.appendChild(newEl);
-                           }
-                           if (setting["alert"] != "none"){
-                               var newEl = document.createElement("div");
-                               newEl.appendChild(document.createTextNode(setting["alert"]));
-                               content.appendChild(newEl);
-                           }
-
-                       }
-                   }
-                   else{
-                       var obj_name = uid_to_name[object["track"]];
-                       var item = drawItem(object["track"], obj_name, rulebase.package+"_objects.html");
-                       td.appendChild(item);
-                       if (object["track-alert"] && object["track-alert"] != "none"){
-                           item.className = "toggle";
-                           var button = document.createElement("span");
-                           button.className = "toggle-button";
-
-                           item.appendChild(button);
-
-                           var content = document.createElement("div");
-                           content.className = "toggle-content";
-                           item.appendChild(content);
-
-                           var newEl = document.createElement("div");
-                           newEl.appendChild(document.createTextNode(object["track-alert"]));
-                           content.appendChild(newEl);
-                       }
-                   }
-                   return td;
-             }
-
-			function isApiVersionNew(){
-				return rulebase["api-version"] != "null" && rulebase["api-version"] != "1";
-			}
-
-			function drawNatRule(ruleObject) {
-				var tr = document.createElement("tr");
-				if (!ruleObject.enabled) {
-					tr.className = "disabled_rule";
-				}
-				var td_number = document.createElement("td");
-				td_number.className = "rule_number";
-				td_number.appendChild(document.createTextNode(ruleObject["rule-number"]));
-
-				tr.appendChild(td_number);
-				tr.appendChild(drawSingleValueCell(ruleObject["original-source"]));
-				tr.appendChild(drawSingleValueCell(ruleObject["original-destination"]));
-				tr.appendChild(drawSingleValueCell(ruleObject["original-service"]));
-
-				tr.appendChild(drawSingleValueCell(ruleObject["translated-source"]));
-				tr.appendChild(drawSingleValueCell(ruleObject["translated-destination"]));
-				tr.appendChild(drawSingleValueCell(ruleObject["translated-service"]));
-
-				tr.appendChild(drawMultiValueCell(ruleObject["install-on"], false));
-				tr.appendChild(drawTextCell(ruleObject, "comments"));
-				return tr;
-
-			}
-
-			function drawAccessRule(ruleObject) {
-				var tr = document.createElement("tr");
-				if (!ruleObject.enabled) {
-					tr.className = "disabled_rule";
-				}
-				var td_number = document.createElement("td");
-				td_number.className = "rule_number";
-				td_number.appendChild(document.createTextNode(ruleObject["rule-number"]));
-
-				var td_action = document.createElement("td");
-				if (uid_to_name[ruleObject["action"]] == "Inner Layer") {
-
-                    var innerLayerName = document.createTextNode("Layer: " + uid_to_name[ruleObject["inline-layer"]]);
-
-                    //Inline layer file name should exist
-				    if ( inline_layer_uid_to_file_name[ruleObject["inline-layer"]] ) {
-				        var linkElem = document.createElement("a");
-                        linkElem.className = "object_link";
-                        linkElem.setAttribute("href", "./" + inline_layer_uid_to_file_name[ruleObject["inline-layer"]]);
-                        linkElem.setAttribute("target", "_blank");
-                        linkElem.appendChild(innerLayerName);
-                        td_action.appendChild(linkElem);
-				    }
-				    else {
-				        td_action.appendChild(innerLayerName);
-				    }
-				}
-				else {
-					td_action = drawSingleValueCell(ruleObject["action"]);
-				}
-
-				var td_data = document.createElement("td");
-				if (uid_to_name[getData(ruleObject)[0]] == "Any") {
-					td_data.appendChild(document.createTextNode("Any"));
-				}
-				else
-				{
-					td_data = drawMultiValueCell(getData(ruleObject), getDataNegate(ruleObject));
-					var dataDirectionText = "(Any direction)";
-					if (getDataDirection(ruleObject)=="up") { dataDirectionText = "(Upload Traffic)";}
-					if (getDataDirection(ruleObject)=="down") { dataDirectionText = "(Download Traffic)";}
-					td_data.appendChild(document.createTextNode(dataDirectionText));
-				}
-				tr.appendChild(td_number);
-
-				if (showHitCount) {
-					tr.appendChild(drawTextCell(ruleObject.hits || {}, "value"));
-				}
-
-				tr.appendChild(drawTextCell(ruleObject, "name"));
-				tr.appendChild(drawMultiValueCell(ruleObject["source"], ruleObject["source-negate"]));
-				tr.appendChild(drawMultiValueCell(ruleObject["destination"], ruleObject["destination-negate"]));
-				tr.appendChild(drawMultiValueCell(ruleObject["vpn"], false));
-				tr.appendChild(drawMultiValueCell(ruleObject["service"], ruleObject["service-negate"]));
-				tr.appendChild(td_data);
-				//tr.appendChild(drawMultiValueCell(getData(ruleObject), getDataNegate(ruleObject)));
-				tr.appendChild(td_action);
-				tr.appendChild(drawTrackValueCell(ruleObject));
-				tr.appendChild(drawMultiValueCell(ruleObject["time"], false));
-				tr.appendChild(drawMultiValueCell(ruleObject["install-on"], false));
-				tr.appendChild(drawTextCell(ruleObject, "comments"));
-				return tr;
-			}
-
-			function drawThreatRule(ruleObject) {
-				var tr = document.createElement("tr");
-				if (!ruleObject.enabled) {
-					tr.className = "disabled_rule";
-				}
-
-				var td_number = document.createElement("td");
-				td_number.className = "rule_number";
-				td_number.setAttribute("colSpan", 1);
-				td_number.appendChild(document.createTextNode(ruleObject["rule-number"]));
-
-				tr.appendChild(td_number);
-				tr.appendChild(drawTextCell(ruleObject, "name"));
-				tr.appendChild(drawMultiValueCell(ruleObject["protected-scope"], ruleObject["protected-scope-negate"]));
-				tr.appendChild(drawMultiValueCell(ruleObject["source"], ruleObject["source-negate"]));
-				tr.appendChild(drawMultiValueCell(ruleObject["destination"], ruleObject["destination-negate"]));
-				tr.appendChild(drawSingleValueCell(ruleObject["protection-or-site"]));
-				tr.appendChild(drawMultiValueCell(ruleObject["service"], ruleObject["service-negate"]));
-				tr.appendChild(drawSingleValueCell(ruleObject["action"]));
-				tr.appendChild(drawSingleValueCell(ruleObject["track"]));
-				tr.appendChild(drawMultiValueCell(ruleObject["install-on"], false));
-				tr.appendChild(drawTextCell(ruleObject, "comments"));
-				return tr;
-
-			}
-
-			function drawThreatException(ruleObject, lastRuleNumber, lastRuleEnabled) {
-				var tr = document.createElement("tr");
-				if (!ruleObject.enabled || !lastRuleEnabled) {
-					tr.className = "disabled_rule";
-				}
-
-				var td_number = document.createElement("td");
-				td_number.className = "rule_number";
-				td_number.appendChild(document.createTextNode("E" + lastRuleNumber + "." + ruleObject["exception-number"]));
-
-
-				tr.appendChild(td_number);
-				tr.appendChild(drawTextCell(ruleObject, "name"));
-				tr.appendChild(drawMultiValueCell(ruleObject["protected-scope"], ruleObject["protected-scope-negate"]));
-				tr.appendChild(drawMultiValueCell(ruleObject["source"], ruleObject["source-negate"]));
-				tr.appendChild(drawMultiValueCell(ruleObject["destination"], ruleObject["destination-negate"]));
-				tr.appendChild(drawMultiValueCell(ruleObject["protection-or-site"], false));
-				tr.appendChild(drawMultiValueCell(ruleObject["service"], ruleObject["service-negate"]));
-				tr.appendChild(drawSingleValueCell(ruleObject["action"]));
-				tr.appendChild(drawSingleValueCell(ruleObject["track"]));
-				tr.appendChild(drawMultiValueCell(ruleObject["install-on"], false));
-				tr.appendChild(drawTextCell(ruleObject, "comments"));
-				return tr;
-			}
-
-			function drawRulebaseColumnHeaders(columns) {
-
-                var headerRow = document.getElementById("rulebase_header_row");
-                columns.forEach(function(entry){
-                    var th = document.createElement("th");
-                    th.appendChild(document.createTextNode(entry));
-                    headerRow.appendChild(th);
-                });
-
-			}
-
-			function drawRulebase() {
-
-			    if (failed_creating_layer){
-
-                     document.getElementById("domain").innerHTML = "Domain: "+ rulebase.domain;
-                     if (rulebase.layer != "IPS") {
-                         document.getElementById("package").innerHTML = "Package: "+ rulebase.package;
-                     }
-                     else {
-                         document.getElementById("package").innerHTML = "Package: "+ "Shared across all policy packages";
-                     }
-                      if (rulebase.type == "access") {
-                             document.getElementById("layer").innerHTML = "Layer: "+ rulebase.layer + " (" + rulebase.type + " layer)";
-                             document.title = rulebase.layer;
-                      }
-                       if (rulebase.type == "nat") {
-                              document.getElementById("layer").innerHTML = "NAT rulebase";
-                              document.title = "NAT";
-                       }
-                       if (rulebase.type == "threat-prevention") {
-                           document.getElementById("layer").innerHTML = "Layer: "+ rulebase.layer + " (" + rulebase.type + " layer)";
-                           document.title = rulebase.layer;
-                       }
-                       var message = document.getElementById("message");
-                       message.className = "failed";
-                       message.innerText = "Failed to create layer. For more information, please refer to the log file in the output tar file." ;
+            td.className = "section";
+            td.setAttribute("colSpan", columns.length);
+            td.appendChild(document.createTextNode(td_text));
+            tr.appendChild(td);
+            return tr;
+        }
 
-                }
-                else{
-                    // add page titles
-                    document.getElementById("domain").innerHTML = "Domain: "+ rulebase.domain;
-                    if (rulebase.layer != "IPS") {
-                        document.getElementById("package").innerHTML = "Package: "+ rulebase.package;
+
+        function drawPlaceholder(placeholderObj) {
+            var tr = document.createElement("tr");
+            var td_number = document.createElement("td");
+            td_number.className = "placeholder_number";
+            td_number.appendChild(document.createTextNode(placeholderObj["rule-number"]));
+            var td_title = document.createElement("td");
+            var td_text = "Placeholder for domain rules";
+            td_title.className = "placeholder";
+            td_title.setAttribute("colSpan", accessColumnHeaders.length - 1);
+            td_title.appendChild(document.createTextNode(td_text));
+            tr.appendChild(td_number);
+            tr.appendChild(td_title);
+            return tr;
+        }
+
+        function drawTextCell(fieldObject, key) {
+            var td = document.createElement("td");
+            td.appendChild(document.createTextNode(getOptionalTextValue(fieldObject, key)));
+            return td;
+        }
+
+        function drawItem(id, name, objectsPage) {
+            // TODO add more words
+            if (id == null) {
+                name = "N/A";
+            }
+            var reservedWords = ["Any", "Policy Targets", "Accept", "Drop", "Reject", "None", "Full Log", "Inner Layer", "Network Log", "N/A"];
+            var divElem = document.createElement("div");
+
+
+            if (reservedWords.indexOf(name) >= 0) {
+                divElem.appendChild(document.createTextNode(name));
+            }
+            else {
+                var linkElem = document.createElement("a");
+                linkElem.className = "object_link";
+                linkElem.setAttribute("href", "./" + objectsPage + "?uid=" + id);
+                linkElem.setAttribute("target", "_blank");
+                linkElem.appendChild(document.createTextNode(name));
+                divElem.appendChild(linkElem);
+            }
+            return divElem;
+        }
+
+
+        function drawSingleValueCell(id) {
+            var td = document.createElement("td");
+            var obj_name = uid_to_name[id];
+            td.appendChild(drawItem(id, obj_name, rulebase.package + "_objects.html"));
+            return td;
+        }
+
+        function drawMultiValueCell(fieldObject, isNegated) {
+            var td = document.createElement("td");
+            if (isNegated) {
+                td.className = "negate";
+            }
+            fieldObject.forEach(function (obj_uid) {
+                var obj_name = uid_to_name[obj_uid];
+                td.appendChild(drawItem(obj_uid, obj_name, rulebase.package + "_objects.html"));
+            });
+            return td;
+        }
+
+        function drawTrackValueCell(object) {
+            var td = document.createElement("td");
+            if (isApiVersionNew() && object["track"]) {
+                var setting = object["track"];
+                var obj_name = uid_to_name[setting["type"]];
+                var item = drawItem(setting["type"], obj_name, rulebase.package + "_objects.html");
+                td.appendChild(item);
+
+                if (setting["per-session"] || setting["per-connection"] || setting["accounting"] || setting["alert"] != "none") {
+                    item.className = "toggle";
+                    var button = document.createElement("span");
+                    button.className = "toggle-button";
+
+                    item.appendChild(button);
+
+                    var content = document.createElement("div");
+                    content.className = "toggle-content";
+                    item.appendChild(content);
+
+                    if (setting["per-session"]) {
+                        var newEl = document.createElement("div");
+                        newEl.appendChild(document.createTextNode("per-session"));
+                        content.appendChild(newEl);
+                    }
+                    if (setting["per-connection"]) {
+                        var newEl = document.createElement("div");
+                        newEl.appendChild(document.createTextNode("per-connection"));
+                        content.appendChild(newEl);
+                    }
+                    if (setting["accounting"]) {
+                        var newEl = document.createElement("div");
+                        newEl.appendChild(document.createTextNode("accounting"));
+                        content.appendChild(newEl);
                     }
-                    else {
-                        document.getElementById("package").innerHTML = "Package: "+ "Shared across all policy packages";
+                    if (setting["alert"] != "none") {
+                        var newEl = document.createElement("div");
+                        newEl.appendChild(document.createTextNode(setting["alert"]));
+                        content.appendChild(newEl);
                     }
 
-                    if (rulebase.type == "access") {
-                        document.getElementById("layer").innerHTML = "Layer: "+ rulebase.layer + " (" + rulebase.type + " layer)";
-                        document.title = rulebase.layer;
-
-                        drawRulebaseColumnHeaders(accessColumnHeaders);
-                        // create rules and sections
-                        var tableBody = document.getElementById("rulebase_table_body");
-                        if (data.length == 0){
-                             var message = document.getElementById("message");
-                             message.className = "empty";
-                             message.innerText = "No rules found in this layer.";
-                        }
-                        data.forEach(function(entry){
+                }
+            }
+            else {
+                var obj_name = uid_to_name[object["track"]];
+                var item = drawItem(object["track"], obj_name, rulebase.package + "_objects.html");
+                td.appendChild(item);
+                if (object["track-alert"] && object["track-alert"] != "none") {
+                    item.className = "toggle";
+                    var button = document.createElement("span");
+                    button.className = "toggle-button";
+
+                    item.appendChild(button);
+
+                    var content = document.createElement("div");
+                    content.className = "toggle-content";
+                    item.appendChild(content);
+
+                    var newEl = document.createElement("div");
+                    newEl.appendChild(document.createTextNode(object["track-alert"]));
+                    content.appendChild(newEl);
+                }
+            }
+            return td;
+        }
+
+        function isApiVersionNew() {
+            return rulebase["api-version"] != "null" && rulebase["api-version"] != "1";
+        }
+
+        function drawNatRule(ruleObject) {
+            var tr = document.createElement("tr");
+            if (!ruleObject.enabled) {
+                tr.className = "disabled_rule";
+            }
+            var td_number = document.createElement("td");
+            td_number.className = "rule_number";
+            td_number.appendChild(document.createTextNode(ruleObject["rule-number"]));
+
+            tr.appendChild(td_number);
+            tr.appendChild(drawSingleValueCell(ruleObject["original-source"]));
+            tr.appendChild(drawSingleValueCell(ruleObject["original-destination"]));
+            tr.appendChild(drawSingleValueCell(ruleObject["original-service"]));
+
+            tr.appendChild(drawSingleValueCell(ruleObject["translated-source"]));
+            tr.appendChild(drawSingleValueCell(ruleObject["translated-destination"]));
+            tr.appendChild(drawSingleValueCell(ruleObject["translated-service"]));
+
+            tr.appendChild(drawMultiValueCell(ruleObject["install-on"], false));
+            tr.appendChild(drawTextCell(ruleObject, "comments"));
+            return tr;
+
+        }
+
+        function drawAccessRule(ruleObject) {
+            var tr = document.createElement("tr");
+            if (!ruleObject.enabled) {
+                tr.className = "disabled_rule";
+            }
+            var td_number = document.createElement("td");
+            td_number.className = "rule_number";
+            td_number.appendChild(document.createTextNode(ruleObject["rule-number"]));
+
+            var td_action = document.createElement("td");
+            if (uid_to_name[ruleObject["action"]] == "Inner Layer") {
+
+                var innerLayerName = document.createTextNode("Layer: " + uid_to_name[ruleObject["inline-layer"]]);
+
+                //Inline layer file name should exist
+                if (inline_layer_uid_to_file_name[ruleObject["inline-layer"]]) {
+                    var linkElem = document.createElement("a");
+                    linkElem.className = "object_link";
+                    linkElem.setAttribute("href", "./" + inline_layer_uid_to_file_name[ruleObject["inline-layer"]]);
+                    linkElem.setAttribute("target", "_blank");
+                    linkElem.appendChild(innerLayerName);
+                    td_action.appendChild(linkElem);
+                }
+                else {
+                    td_action.appendChild(innerLayerName);
+                }
+            }
+            else {
+                td_action = drawSingleValueCell(ruleObject["action"]);
+            }
+
+            var td_data = document.createElement("td");
+            if (uid_to_name[getData(ruleObject)[0]] == "Any") {
+                td_data.appendChild(document.createTextNode("Any"));
+            }
+            else {
+                td_data = drawMultiValueCell(getData(ruleObject), getDataNegate(ruleObject));
+                var dataDirectionText = "(Any direction)";
+                if (getDataDirection(ruleObject) == "up") {
+                    dataDirectionText = "(Upload Traffic)";
+                }
+                if (getDataDirection(ruleObject) == "down") {
+                    dataDirectionText = "(Download Traffic)";
+                }
+                td_data.appendChild(document.createTextNode(dataDirectionText));
+            }
+            tr.appendChild(td_number);
+
+            if (showHitCount) {
+                tr.appendChild(drawTextCell(ruleObject.hits || {}, "value"));
+            }
+
+            tr.appendChild(drawTextCell(ruleObject, "name"));
+            tr.appendChild(drawMultiValueCell(ruleObject["source"], ruleObject["source-negate"]));
+            tr.appendChild(drawMultiValueCell(ruleObject["destination"], ruleObject["destination-negate"]));
+            tr.appendChild(drawMultiValueCell(ruleObject["vpn"], false));
+            tr.appendChild(drawMultiValueCell(ruleObject["service"], ruleObject["service-negate"]));
+            tr.appendChild(td_data);
+            //tr.appendChild(drawMultiValueCell(getData(ruleObject), getDataNegate(ruleObject)));
+            tr.appendChild(td_action);
+            tr.appendChild(drawTrackValueCell(ruleObject));
+            tr.appendChild(drawMultiValueCell(ruleObject["time"], false));
+            tr.appendChild(drawMultiValueCell(ruleObject["install-on"], false));
+            tr.appendChild(drawTextCell(ruleObject, "comments"));
+            return tr;
+        }
+
+        function drawThreatRule(ruleObject) {
+            var tr = document.createElement("tr");
+            if (!ruleObject.enabled) {
+                tr.className = "disabled_rule";
+            }
+
+            var td_number = document.createElement("td");
+            td_number.className = "rule_number";
+            td_number.setAttribute("colSpan", 1);
+            td_number.appendChild(document.createTextNode(ruleObject["rule-number"]));
+
+            tr.appendChild(td_number);
+            tr.appendChild(drawTextCell(ruleObject, "name"));
+            tr.appendChild(drawMultiValueCell(ruleObject["protected-scope"], ruleObject["protected-scope-negate"]));
+            tr.appendChild(drawMultiValueCell(ruleObject["source"], ruleObject["source-negate"]));
+            tr.appendChild(drawMultiValueCell(ruleObject["destination"], ruleObject["destination-negate"]));
+            tr.appendChild(drawSingleValueCell(ruleObject["protection-or-site"]));
+            tr.appendChild(drawMultiValueCell(ruleObject["service"], ruleObject["service-negate"]));
+            tr.appendChild(drawSingleValueCell(ruleObject["action"]));
+            tr.appendChild(drawSingleValueCell(ruleObject["track"]));
+            tr.appendChild(drawMultiValueCell(ruleObject["install-on"], false));
+            tr.appendChild(drawTextCell(ruleObject, "comments"));
+            return tr;
+
+        }
+
+        function drawThreatException(ruleObject, lastRuleNumber, lastRuleEnabled) {
+            var tr = document.createElement("tr");
+            if (!ruleObject.enabled || !lastRuleEnabled) {
+                tr.className = "disabled_rule";
+            }
+
+            var td_number = document.createElement("td");
+            td_number.className = "rule_number";
+            td_number.appendChild(document.createTextNode("E" + lastRuleNumber + "." + ruleObject["exception-number"]));
+
+
+            tr.appendChild(td_number);
+            tr.appendChild(drawTextCell(ruleObject, "name"));
+            tr.appendChild(drawMultiValueCell(ruleObject["protected-scope"], ruleObject["protected-scope-negate"]));
+            tr.appendChild(drawMultiValueCell(ruleObject["source"], ruleObject["source-negate"]));
+            tr.appendChild(drawMultiValueCell(ruleObject["destination"], ruleObject["destination-negate"]));
+            tr.appendChild(drawMultiValueCell(ruleObject["protection-or-site"], false));
+            tr.appendChild(drawMultiValueCell(ruleObject["service"], ruleObject["service-negate"]));
+            tr.appendChild(drawSingleValueCell(ruleObject["action"]));
+            tr.appendChild(drawSingleValueCell(ruleObject["track"]));
+            tr.appendChild(drawMultiValueCell(ruleObject["install-on"], false));
+            tr.appendChild(drawTextCell(ruleObject, "comments"));
+            return tr;
+        }
+
+        function drawRulebaseColumnHeaders(columns) {
+
+            var headerRow = document.getElementById("rulebase_header_row");
+            columns.forEach(function (entry) {
+                var th = document.createElement("th");
+                th.appendChild(document.createTextNode(entry));
+                headerRow.appendChild(th);
+            });
+
+        }
+
+        function drawRulebase() {
+
+            if (failed_creating_layer) {
+
+                document.getElementById("domain").innerHTML = "Domain: " + rulebase.domain;
+                if (rulebase.layer != "IPS") {
+                    document.getElementById("package").innerHTML = "Package: " + rulebase.package;
+                }
+                else {
+                    document.getElementById("package").innerHTML = "Package: " + "Shared across all policy packages";
+                }
+                if (rulebase.type == "access") {
+                    document.getElementById("layer").innerHTML = "Layer: " + rulebase.layer + " (" + rulebase.type + " layer)";
+                    document.title = rulebase.layer;
+                }
+                if (rulebase.type == "nat") {
+                    document.getElementById("layer").innerHTML = "NAT rulebase";
+                    document.title = "NAT";
+                }
+                if (rulebase.type == "threat-prevention") {
+                    document.getElementById("layer").innerHTML = "Layer: " + rulebase.layer + " (" + rulebase.type + " layer)";
+                    document.title = rulebase.layer;
+                }
+                var message = document.getElementById("message");
+                message.className = "failed";
+                message.innerText = "Failed to create layer. For more information, please refer to the log file in the output tar file.";
+
+            }
+            else {
+                // add page titles
+                document.getElementById("domain").innerHTML = "Domain: " + rulebase.domain;
+                if (rulebase.layer != "IPS") {
+                    document.getElementById("package").innerHTML = "Package: " + rulebase.package;
+                }
+                else {
+                    document.getElementById("package").innerHTML = "Package: " + "Shared across all policy packages";
+                }
+
+                if (rulebase.type == "access") {
+                    document.getElementById("layer").innerHTML = "Layer: " + rulebase.layer + " (" + rulebase.type + " layer)";
+                    document.title = rulebase.layer;
+
+                    drawRulebaseColumnHeaders(accessColumnHeaders);
+                    // create rules and sections
+                    var tableBody = document.getElementById("rulebase_table_body");
+                    if (data.length == 0) {
+                        var message = document.getElementById("message");
+                        message.className = "empty";
+                        message.innerText = "No rules found in this layer.";
+                    }
+                    data.forEach(function (entry) {
                         if (entry.type == "access-section") {
-                            tableBody.appendChild(drawSection(entry,accessColumnHeaders, ""));
-                            }
+                            tableBody.appendChild(drawSection(entry, accessColumnHeaders, ""));
+                        }
                         if (entry.type == "access-rule") {
-                                tableBody.appendChild(drawAccessRule(entry));
-                            }
-                            if (entry.type == "place-holder") {
-                                tableBody.appendChild(drawPlaceholder(entry));
-                            }
-                        });
-                    }
+                            tableBody.appendChild(drawAccessRule(entry));
+                        }
+                        if (entry.type == "place-holder") {
+                            tableBody.appendChild(drawPlaceholder(entry));
+                        }
+                    });
+                }
 
-                    if (rulebase.type == "nat") {
-                        document.getElementById("layer").innerHTML = "NAT rulebase";
-                        document.title = "NAT";
-
-                        drawRulebaseColumnHeaders(natColumnHeaders);
-                        // create rules and sections
-                        var tableBody = document.getElementById("rulebase_table_body");
-                        if (data.length == 0){
-                             var message = document.getElementById("message");
-                             message.className = "empty";
-                             message.innerText = "No rules found in this layer.";
+                if (rulebase.type == "nat") {
+                    document.getElementById("layer").innerHTML = "NAT rulebase";
+                    document.title = "NAT";
+
+                    drawRulebaseColumnHeaders(natColumnHeaders);
+                    // create rules and sections
+                    var tableBody = document.getElementById("rulebase_table_body");
+                    if (data.length == 0) {
+                        var message = document.getElementById("message");
+                        message.className = "empty";
+                        message.innerText = "No rules found in this layer.";
+                    }
+                    data.forEach(function (entry) {
+                        if (entry.type == "nat-section") {
+                            tableBody.appendChild(drawSection(entry, natColumnHeaders, ""));
+                        }
+                        if (entry.type == "nat-rule") {
+                            tableBody.appendChild(drawNatRule(entry));
+                        }
+                        if (entry.type == "place-holder") {
+                            tableBody.appendChild(drawPlaceholder(entry));
                         }
-                        data.forEach(function(entry){
-                            if (entry.type == "nat-section") {
-                                tableBody.appendChild(drawSection(entry,natColumnHeaders, ""));
-                            }
-                            if (entry.type == "nat-rule") {
-                                tableBody.appendChild(drawNatRule(entry));
-                            }
-                            if (entry.type == "place-holder") {
-                                tableBody.appendChild(drawPlaceholder(entry));
-                            }
-                        });
+                    });
+                }
+
+                if (rulebase.type == "threat-prevention") {
+
+                    document.getElementById("layer").innerHTML = "Layer: " + rulebase.layer + " (" + rulebase.type + " layer)";
+                    document.title = rulebase.layer;
+
+                    drawRulebaseColumnHeaders(threatColumnHeaders);
+                    // create rules and sections
+                    var tableBody = document.getElementById("rulebase_table_body");
+                    var lastRuleNumber;
+                    var lastRuleEnabled;
+                    if (data.length == 0) {
+                        var message = document.getElementById("message");
+                        message.className = "empty";
+                        message.innerText = "No rules found in this layer.";
                     }
+                    data.forEach(function (entry) {
+
+                        if (entry.type == "threat-section") {
+                            tableBody.appendChild(drawSection(entry, threatColumnHeaders, "E" + lastRuleNumber + "."));
+                        }
 
-                    if (rulebase.type == "threat-prevention") {
+                        if (entry.type == "threat-rule") {
+                            tableBody.appendChild(drawThreatRule(entry));
+                            lastRuleNumber = entry["rule-number"];
+                            lastRuleEnabled = entry["enabled"];
+                        }
 
-                        document.getElementById("layer").innerHTML = "Layer: "+ rulebase.layer + " (" + rulebase.type + " layer)";
-                        document.title = rulebase.layer;
+                        if (entry.type == "threat-exception") {
+                            tableBody.appendChild(drawThreatException(entry, lastRuleNumber, lastRuleEnabled));
+                        }
 
-                        drawRulebaseColumnHeaders(threatColumnHeaders);
-                        // create rules and sections
-                        var tableBody = document.getElementById("rulebase_table_body");
-                        var lastRuleNumber;
-                        var lastRuleEnabled;
-                        if (data.length == 0){
-                             var message = document.getElementById("message");
-                             message.className = "empty";
-                              message.innerText = "No rules found in this layer.";
+                        if (entry.type == "place-holder") {
+                            tableBody.appendChild(drawPlaceholder(entry));
                         }
-                        data.forEach(function(entry){
-
-                            if (entry.type == "threat-section") {
-                                tableBody.appendChild(drawSection(entry,threatColumnHeaders, "E" + lastRuleNumber + "."));
-                            }
-
-                            if (entry.type == "threat-rule") {
-                                tableBody.appendChild(drawThreatRule(entry));
-                                lastRuleNumber = entry["rule-number"];
-                                lastRuleEnabled = entry["enabled"];
-                            }
-
-                            if (entry.type == "threat-exception") {
-                                tableBody.appendChild(drawThreatException(entry, lastRuleNumber, lastRuleEnabled));
-                            }
-
-                            //TODO?
-                            if (entry.type == "place-holder") {
-                                tableBody.appendChild(drawPlaceholder(entry));
-                            }
-                        });
+                    });
+                }
+                trackButton();
+            }
+        }
+
+        function trackButton() {
+
+            document.getElementById("rulebase_table_body").addEventListener('click', function (e) {
+                var node = e.target;
+
+                while (node != this) {
+                    if (~node.className.split(' ').indexOf("toggle-button")) {
+                        toggleClass(node.parentNode, "open");
+                        e.stopPropagation();
+                        return;
                     }
-                    trackButton();
-				}
-			}
-
-			function trackButton(){
-
-				document.getElementById("rulebase_table_body").addEventListener('click', function(e){
-					var node = e.target;
-
-					while (node != this) {
-					  if (~node.className.split(' ').indexOf("toggle-button")) {
-						toggleClass(node.parentNode, "open");
-						e.stopPropagation();
-						return;
-					  }
-					  node = node.parentNode;
-					}
-				});
-			}
-
-			function toggleClass(elt, cls) {
-                if (!elt) return;
-
-                var classArr = (elt.className || "").split(" ");
-                var classIndex = classArr.indexOf(cls);
-                if (~classIndex) {
-                                classArr[classIndex] = null;
-                } else {
-                                classArr.push(cls);
+                    node = node.parentNode;
                 }
+            });
+        }
 
-                elt.className = classArr.join(" ").replace(/\s{2,}/g, ' ').replace(/^\s+|\s+$/g, '');
-            }
+        function toggleClass(elt, cls) {
+            if (!elt) return;
 
-            function getDataHeader()
-            {
-                return isApiVersionNew() ? "Content" : "Data";
+            var classArr = (elt.className || "").split(" ");
+            var classIndex = classArr.indexOf(cls);
+            if (~classIndex) {
+                classArr[classIndex] = null;
+            } else {
+                classArr.push(cls);
             }
 
-            function getData(ruleObj) {
-                return ruleObj['data'] || ruleObj['content'];
-            }
+            elt.className = classArr.join(" ").replace(/\s{2,}/g, ' ').replace(/^\s+|\s+$/g, '');
+        }
 
-            function getDataDirection(ruleObj) {
-                return ruleObj['data-direction'] || ruleObj['content-direction'];
-            }
+        function getDataHeader() {
+            return isApiVersionNew() ? "Content" : "Data";
+        }
 
-            function getDataNegate(ruleObj) {
-                return ruleObj['data-negate'] || ruleObj['content-negate'];
-            }
-		</script>
-
-
-	</head>
-	<body onload="drawRulebase()">
-	  <h3>
-	     <div id="domain"></div>
-		 <div id="package"></div>
-		 <div id="layer"></div>
-		 <div id="message"></div>
-	  </h3>
-	  <table>
-		<thead>
-		  <tr id="rulebase_header_row">
-		  <tr>
-		</thead>
-		<tbody id="rulebase_table_body">
-		</tbody>
-	  </table>
-	</body>
+        function getData(ruleObj) {
+            return ruleObj['data'] || ruleObj['content'];
+        }
+
+        function getDataDirection(ruleObj) {
+            return ruleObj['data-direction'] || ruleObj['content-direction'];
+        }
+
+        function getDataNegate(ruleObj) {
+            return ruleObj['data-negate'] || ruleObj['content-negate'];
+        }
+    </script>
+
+</head>
+<body onload="drawRulebase()">
+    <h3>
+        <div id="domain"></div>
+        <div id="package"></div>
+        <div id="layer"></div>
+        <div id="message"></div>
+    </h3>
+    <table>
+        <thead>
+            <tr id="rulebase_header_row">
+            <tr>
+        </thead>
+        <tbody id="rulebase_table_body">
+        </tbody>
+    </table>
+</body>
 </html>
