diff --git a/ontospy/gendocs/CONFIG.py b/ontospy/gendocs/CONFIG.py
index 3c42652..63795a1 100755
--- a/ontospy/gendocs/CONFIG.py
+++ b/ontospy/gendocs/CONFIG.py
@@ -24,17 +24,17 @@
                        },
                        {
                            "ID": "d3-bubble-chart",
-                           "Title": "D3 Bubble chart [alpha]",
+                           "Title": "D3 Bubble chart",
                            "Description": "@todo",
                        },
                        {
                            "ID": "d3-pack-hierarchy",
-                           "Title": "D3 Pack hierarchy [alpha]",
+                           "Title": "D3 Pack hierarchy",
                            "Description": "@todo",
                        },
                        {
                            "ID": "d3-bar-hierarchy",
-                           "Title": "D3 Bar hierarchy [alpha]",
+                           "Title": "D3 Bar hierarchy",
                            "Description": "@todo",
                        },
                        {
diff --git a/ontospy/gendocs/jinja_env.py b/ontospy/gendocs/jinja_env.py
index ab8dc28..cea9cba 100644
--- a/ontospy/gendocs/jinja_env.py
+++ b/ontospy/gendocs/jinja_env.py
@@ -40,13 +40,16 @@ def slugify_filter(value):
 @pass_eval_context
 def linebreaks_filter(eval_ctx, value):
     """A filter for legacy django templates."""
-    if not value:
-        return ""
-    result = u'\n\n'.join(u'<p>%s</p>' % p.replace('\n', '<br>\n')
-                      for p in _paragraph_re.split(escape(value)))
-    if eval_ctx.autoescape:
-        result = Markup(result)
-    return result
+    try:
+        if not value:
+            return ""
+        result = u'\n\n'.join(u'<p>%s</p>' % p.replace('\n', '<br>\n')
+                        for p in _paragraph_re.split(escape(value)))
+        if eval_ctx.autoescape:
+            result = Markup(result)
+        return result
+    except:
+        return value
 
 env.filters['linebreaks'] = linebreaks_filter
 
diff --git a/ontospy/gendocs/media/templates/d3/d3_bar_hierarchy.html b/ontospy/gendocs/media/templates/d3/d3_bar_hierarchy.html
index b463f2d..97cf076 100755
--- a/ontospy/gendocs/media/templates/d3/d3_bar_hierarchy.html
+++ b/ontospy/gendocs/media/templates/d3/d3_bar_hierarchy.html
@@ -49,6 +49,7 @@
 			background: white;
 		}
 
+
 </style>
 
 {% endblock custom_css %}
@@ -61,25 +62,48 @@
 
 
 
+	<div class="row header">
+			
+			
+			
+				
+		{% if TOTAL_CLASSES %}
+			<a href="index.html" class="{% if thispage=="classes" %}active{% endif %}">Classes ({{TOTAL_CLASSES}})</a>&nbsp;&nbsp;
+		{% endif %}
+		
+		{% if TOTAL_PROPERTIES %}
+			<a href="properties.html" class="{% if thispage=="properties" %}active{% endif %}">Properties ({{TOTAL_PROPERTIES}})</a>&nbsp;&nbsp;
+		{% endif %}
+		
+		{% if TOTAL_CONCEPTS %}
+			<a href="skos.html" class="{% if thispage=="concepts" %}active{% endif %}">Concepts ({{TOTAL_CONCEPTS}})</a>
+		{% endif %}
+			
+			
+		
+
+	</div>
+
 
-	{% if TOTAL_CLASSES %}
-		<div class="row">
-			<h3>Classes ({{TOTAL_CLASSES}})</h3>
+	<div class="row">
 
-			<br /><br />
-			<div id="breadcrumbs">Branch: 
-				<li class="bde">Owl:Thing</li>
-			</div>
 
 
+		<br /><br />
+		<div id="breadcrumbs">Branch: 
+			<li class="bde">Owl:Thing</li>
+		</div>
 
-			<div class="col-md-12" id="graph_classes" style="margin-top: 10px;">
 
-			</div>
+		<!-- the graph -->
+		
+		<div class="col-md-12" id="the_graph">
 
 
 		</div>
-	{% endif %}
+
+
+	</div>
 
 
 
@@ -124,7 +148,7 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
 
 <script type="text/javascript">
 
-    var root = {{JSON_DATA_CLASSES|safe}} ;
+    var root = {{JSON_DATA_OBJECTS|safe}} ;
 
 	var m = [80, 160, 0, 260], // top right bottom left
 	    w = 1280 - m[1] - m[3], // width
@@ -142,7 +166,7 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
         .tickFormat(d3.format("d"))
 	    .orient("top");
 
-	var svg = d3.select("#graph_classes").append("svg:svg")
+	var svg = d3.select("#the_graph").append("svg:svg")
 	    .attr("width", w + m[1] + m[3])
 	    .attr("height", h + m[0] + m[2])
 	  .append("svg:g")
diff --git a/ontospy/gendocs/media/templates/d3/d3_bubble_chart.html b/ontospy/gendocs/media/templates/d3/d3_bubble_chart.html
index 3b29403..14db61a 100755
--- a/ontospy/gendocs/media/templates/d3/d3_bubble_chart.html
+++ b/ontospy/gendocs/media/templates/d3/d3_bubble_chart.html
@@ -37,11 +37,6 @@
     stroke-width: .5px;
   }
 
-  {#note: June 20, 2016 removed to allow mousetips on all circles #}
-  {#circle.child {#}
-  {#  pointer-events: none;#}
-  {# } #}
-
 
   circle.child:hover {
     stroke: #ff7f0e;
@@ -58,27 +53,48 @@
 
 
 
+  {% block main_content %}
 
 
-{% block main_content %}
-
+	<div class="row header">
+		
+		
+		
+			
+		{% if TOTAL_CLASSES %}
+			<a href="index.html" class="{% if thispage=="classes" %}active{% endif %}">Classes ({{TOTAL_CLASSES}})</a>&nbsp;&nbsp;
+		{% endif %}
+		
+		{% if TOTAL_PROPERTIES %}
+			<a href="properties.html" class="{% if thispage=="properties" %}active{% endif %}">Properties ({{TOTAL_PROPERTIES}})</a>&nbsp;&nbsp;
+		{% endif %}
+		
+		{% if TOTAL_CONCEPTS %}
+			<a href="skos.html" class="{% if thispage=="concepts" %}active{% endif %}">Concepts ({{TOTAL_CONCEPTS}})</a>
+		{% endif %}
+			
+			
+		
 
+	</div>
 
-	{% if TOTAL_CLASSES %}
-		<div class="row">
-			<h3>Classes ({{TOTAL_CLASSES}})</h3>
-			<div class="col-md-12" id="graph_classes">
 
+	<div class="row">
 
-			</div>
+		<!-- the graph -->
+		
+		<div class="col-md-12" id="the_graph">
 
 
 		</div>
-	{% endif %}
+
+
+	</div>
+
 
 
 
-  {% endblock main_content %}
+{% endblock main_content %}
 
 
 
@@ -124,7 +140,7 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
 
 <script type="text/javascript">
 
-	var root = {{JSON_DATA_CLASSES|safe}} ;
+	var root = {{JSON_DATA_OBJECTS|safe}} ;
 
     var diameter = 960,
     format = d3.format(",d"),
@@ -135,7 +151,7 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
         .size([diameter, diameter])
         .padding(1.5);
 
-    var svg = d3.select("#graph_classes").append("svg")
+    var svg = d3.select("#the_graph").append("svg")
         .attr("width", diameter)
         .attr("height", diameter)
         .attr("class", "bubble");
@@ -186,7 +202,6 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
           .style("text-anchor", "middle")
           .style("pointer-events", "none")
           .text(function(d) { return d.className.substring(0, d.r / 3); });
-{#    });#}
 
     // Returns a flattened hierarchy containing all leaf nodes under the root.
     function classes(root) {
diff --git a/ontospy/gendocs/media/templates/d3/d3_dendogram copy.html b/ontospy/gendocs/media/templates/d3/d3_dendogram copy.html
deleted file mode 100755
index b22d516..0000000
--- a/ontospy/gendocs/media/templates/d3/d3_dendogram copy.html	
+++ /dev/null
@@ -1,531 +0,0 @@
-{% extends "shared/d3_base.html" %}
-
-
-
-
-{% block custom_css %}
-
-
-<style type="text/css" media="screen">
-
-
-
-/* rect {
-fill: none;
-pointer-events: all;
-}*/
-
-rect {
-fill:black;
-stroke:none;
-}
-
-line {
-stroke: #000;
-stroke-width: 1.5px;
-}
-
-.string, .regexp {
-color: #f39;
-}
-
-
-/*extra css*/
-
-.node circle {
-cursor: pointer;
-fill: #fff;
-stroke: steelblue;
-stroke-width: 1.5px;
-}
-
-.node text {
-font-size: 11px;
-}
-
-path.link {
-fill: none;
-stroke: #ccc;
-stroke-width: 1.5px;
-}
-
-
-.infoentity {
-	stroke: white;
-	stroke-width: 2.5px;
-	opacity: 0.7;
-	background: linen;
-	line-height: 0.7em;
-}
-
-
-.smalldesc {
-	font-size: 20px;
-	margin-top: 0px;
-	color: black;
-}
-
-kbd {
-	padding: 2px 4px;
-	font-size: 90%;
-	color: #fff;
-	background-color: #333;
-	border-radius: 3px;
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);
-	border-image-outset: 1;
-}
-    
-
-
-</style>
-
-
-{% endblock custom_css %}
-
-
-
-
-
-
-
-{% block main_content %}
-
-
-
-	{% if TOTAL_CLASSES %}
-	<div class="row">
-		<h3>Classes ({{TOTAL_CLASSES}})</h3>
-		<div class="col-md-12" id="graph_classes">
-
-
-		</div>
-
-
-	</div>
-	{% endif %}
-
-	{% if TOTAL_PROPERTIES %}
-	<div class="row">
-		<h3>Properties ({{TOTAL_PROPERTIES}})</h3>
-		<div class="col-md-12" id="graph_properties">
-
-
-		</div>
-
-
-	</div>
-	{% endif %}
-
-
-	{% if TOTAL_CONCEPTS %}
-
-	<div class="row">
-		<h3>Concepts ({{TOTAL_CONCEPTS}})</h3>
-		<div class="col-md-12" id="graph_concepts">
-
-
-		</div>
-
-
-	</div>
-
-	{% endif %}
-
-
-
-
-{% endblock main_content %}
-
-
-
-
-{% block extra_footer %}
-
-Visualization developed with <a class="greylink" href="https://github.com/d3/d3">d3.js</a>.
-
-{% endblock extra_footer %}
-
-
-
-
-
-
-
-
-{% block the_javascript %}
-
-
-
-
-
-	{# JAVASCRIPT #}
-
-	{% if save_on_github %}
-
-		<script type="text/javascript" src="http://d3js.org/d3.v3.min.js"></script>
-
-
-	    <script type="text/javascript" src="
-https://cdnjs.cloudflare.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-	    <script type="text/javascript" src="http://nnattawat.github.io/slideReveal/asset/js/jquery.slidereveal.js"></script>
-
-	{% else %}
-
-		<script type="text/javascript" src="{{STATIC_URL}}libs/d3-v2/d3.v2.min.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}libs/d3-v2/d3.layout.tree.js"></script>
-
-	    <script type="text/javascript" src="{{STATIC_URL}}libs/jquery/jquery-1.7.1.min.js"></script>
-	    <script type="text/javascript" src="{{STATIC_URL}}libs/jquery/jquery.slidereveal.min.js"></script>
-
-
-	{% endif %}
-
-
-
-
-	{% include 'shared/js_slidereveal.html' %}
-
-
-
-
-
-{# JAVASCRIPT FOR D3 TREE #}
-
-
-<script type="text/javascript">
-
-//
-// CLASSES
-//
-
-{% if TOTAL_CLASSES %}
-
-	var json1 = {{JSON_DATA_CLASSES|safe}};
-
-	{% if TOTAL_CLASSES_TOPLAYER > 40 %}
-	var variable_height1 = 1200;
-	{% else %}
-	var variable_height1 = 800;
-	{% endif %}
-
-	var m = [20, 120, 100, 120],
-	    w = 2600 - m[1] - m[3],
-	    h = variable_height1 - m[0] - m[2],
-	    i = 0,
-	    root_classes;
-
-	var tree1 = d3.layout.tree()
-	    .size([h, w]);
-
-	var diagonal1 = d3.svg.diagonal()
-	    .projection(function(d) { return [d.y, d.x]; });
-
-	var vis1 = d3.select("#graph_classes").append("svg:svg")
-	    .attr("width", w + m[1] + m[3])
-	    .attr("height", h + m[0] + m[2])
-	  	.append("svg:g")
-	    .attr("transform", "translate(" + m[3] + "," + m[0] + ")");
-
-	root_classes = json1;
-	root_classes.x0 = h / 2;
-	root_classes.y0 = 0;
-
-
-	{% if TOTAL_CLASSES > 200 %}
-
-		// Initialize the display to show no nodes:
-		root_classes.children.forEach(toggleAll);
-
-	{% endif %}
-
-
-	update(vis1, tree1, diagonal1, root_classes, json1);
-
-{% endif %}
-
-
-
-
-
-//
-// PROPERTIES
-//
-
-
-{% if TOTAL_PROPERTIES %}
-
-
-	var json2 = {{JSON_DATA_PROPERTIES|safe}};
-
-
-	{% if TOTAL_PROPERTIES_TOPLAYER > 40 %}
-	var variable_height2 = 1200;
-	{% else %}
-	var variable_height2 = 800;
-	{% endif %}
-
-	var m = [20, 120, 100, 120],
-	    w = 2600 - m[1] - m[3],
-	    h = variable_height2 - m[0] - m[2],
-	    i = 0,
-	    root_properties;
-
-	var tree2 = d3.layout.tree()
-	    .size([h, w]);
-
-	var diagonal2 = d3.svg.diagonal()
-	    .projection(function(d) { return [d.y, d.x]; });
-
-	var vis2 = d3.select("#graph_properties").append("svg:svg")
-	    .attr("width", w + m[1] + m[3])
-	    .attr("height", h + m[0] + m[2])
-	  	.append("svg:g")
-	    .attr("transform", "translate(" + m[3] + "," + m[0] + ")");
-
-	root_properties = json2;
-	root_properties.x0 = h / 2;
-	root_properties.y0 = 0;
-
-	{% if TOTAL_PROPERTIES > 200 %}
-
-		// Initialize the display to show no nodes:
-		root_properties.children.forEach(toggleAll);
-	{% endif %}
-
-
-	update(vis2, tree2, diagonal2, root_properties, json2);
-
-{% endif %}
-
-
-
-
-
-{% if TOTAL_CONCEPTS %}
-
-	var json3 = {{JSON_DATA_CONCEPTS|safe}};
-
-
-	{% if TOTAL_CONCEPTS_TOPLAYER > 40 %}
-	var variable_height3 = 1200;
-	{% else %}
-	var variable_height3 = 800;
-	{% endif %}
-
-	var m = [20, 120, 100, 120],
-	    w = 2600 - m[1] - m[3],
-	    h = variable_height3 - m[0] - m[2],
-	    i = 0,
-	    root_concepts;
-
-	var tree3 = d3.layout.tree()
-	    .size([h, w]);
-
-	var diagonal3 = d3.svg.diagonal()
-	    .projection(function(d) { return [d.y, d.x]; });
-
-	var vis3 = d3.select("#graph_concepts").append("svg:svg")
-	    .attr("width", w + m[1] + m[3])
-	    .attr("height", h + m[0] + m[2])
-	    .append("svg:g")
-	    .attr("transform", "translate(" + m[3] + "," + m[0] + ")");
-
-	root_concepts = json3;
-	root_concepts.x0 = h / 2;
-	root_concepts.y0 = 0;
-
-
-
-	{% if TOTAL_CONCEPTS > 200 %}
-		// Initialize the display to show no nodes:
-		root_concepts.children.forEach(toggleAll);
-	{% endif %}
-
-
-
-	update(vis3, tree3, diagonal3, root_concepts, json3);
-
-
-{% endif %}
-
-
-
-//
-//  SHARED FUNCTIONS
-//
-
-
-// mikele: added more args [vis, tree, diagonal, root] which originally were referenced as a Global var
-function update(vis, tree, diagonal, source, root) {
-
-  var duration = d3.event && d3.event.altKey ? 5000 : 500;
-
-  // Compute the new tree layout.
-  var nodes = tree.nodes(root).reverse();
-
-  // Normalize for fixed-depth.
-  nodes.forEach(function(d) { d.y = d.depth * 180; });
-
-  // Update the nodes…
-  var node = vis.selectAll("g.node")
-      .data(nodes, function(d) { return d.id || (d.id = ++i); });
-
-  // Enter any new nodes at the parent's previous position.
-  var nodeEnter = node.enter().append("svg:g")
-      .attr("class", "node")
-      .attr("transform", function(d) { return "translate(" + source.y0 + "," + source.x0 + ")"; });
-
-
-  nodeEnter.append("svg:circle")
-      .attr("r", 1e-6)
-      .style("fill", function(d) { return d._children ? "lightsteelblue" : "#fff"; })
-      .on("click", function(d) { toggle(d); update(vis, tree, diagonal, d, root); }); // note ref to <root>
-
-  nodeEnter.append("svg:text")
-      .attr("x", function(d) { return d.children || d._children ? -10 : 10; })
-      .attr("dy", ".35em")
-      .attr("text-anchor", function(d) { return d.children || d._children ? "end" : "start"; })
-      .text(function(d) { return d.name; })
-      .style("fill-opacity", 1e-6)
-      .on("click", function(d) { showpanel(d.objid); })
-	  .on("mouseover", function(d){
-			d3.select(this).attr("fill", "darkorange");
-			tooltip.text(d.qname);
-			tooltip.style("visibility", "visible"); }
-		)
-      .on("mousemove", function(d){return tooltip.style("top",
-		    (d3.event.pageY-100)+"px").style("left",(d3.event.pageX+50)+"px");})
-	  .on("mouseout", function(d){
-			d3.select(this).attr("fill", ""); // default = no stroke
-			return tooltip.style("visibility", "hidden");}
-			);
-	  // .on("mouseover", function(d, i) {
-	  // 		  label_name.text(d.name);
-	  // })
-	  // .on("mouseout", function(d, i) {
-	  // 		  label_name.text("");
-	  // });
-
-
-
-   // approach 1
-  var label_name = vis.append("text")
-      .attr("x", 20)
-      .attr("y", 200)
-	  // .attr("text-anchor", "middle")
-      .attr("opacity", "1")
-	  .style("font-size", "90px")
-	  .style("fill", "lightsteelblue")
-	  .text("");
-
-   // approach 2
-  var tooltip = d3.select("body")
-	    .append("div")
-	    .style("position", "absolute")
-	    .style("border-radius", "25px")
-	    .style("z-index", "100")
-	    .style("visibility", "hidden")
-	    .style("opacity", ".85")
-	    .style("color", "lightsteelblue")
-	    .style("background", "white")
-	    .style("font-size", "90px")
-	    .text("a simple tooltip");
-
-
-  // Transition nodes to their new position.
-  var nodeUpdate = node.transition()
-      .duration(duration)
-      .attr("transform", function(d) { return "translate(" + d.y + "," + d.x + ")"; });
-
-  nodeUpdate.select("circle")
-      .attr("r", 4.5)
-      .style("fill", function(d) { return d._children ? "lightsteelblue" : "#fff"; });
-
-  nodeUpdate.select("text")
-      .style("fill-opacity", 1);
-
-  // Transition exiting nodes to the parent's new position.
-  var nodeExit = node.exit().transition()
-      .duration(duration)
-      .attr("transform", function(d) { return "translate(" + source.y + "," + source.x + ")"; })
-      .remove();
-
-  nodeExit.select("circle")
-      .attr("r", 1e-6);
-
-  nodeExit.select("text")
-      .style("fill-opacity", 1e-6);
-
-  // Update the links…
-  var link = vis.selectAll("path.link")
-      .data(tree.links(nodes), function(d) { return d.target.id; });
-
-  // Enter any new links at the parent's previous position.
-  link.enter().insert("svg:path", "g")
-      .attr("class", "link")
-      .attr("d", function(d) {
-        var o = {x: source.x0, y: source.y0};
-        return diagonal({source: o, target: o});
-      })
-    .transition()
-      .duration(duration)
-      .attr("d", diagonal);
-
-  // Transition links to their new position.
-  link.transition()
-      .duration(duration)
-      .attr("d", diagonal);
-
-  // Transition exiting nodes to the parent's new position.
-  link.exit().transition()
-      .duration(duration)
-      .attr("d", function(d) {
-        var o = {x: source.x, y: source.y};
-        return diagonal({source: o, target: o});
-      })
-      .remove();
-
-  // Stash the old positions for transition.
-  nodes.forEach(function(d) {
-    d.x0 = d.x;
-    d.y0 = d.y;
-  });
-
-
-}  // end of Update
-
-
-
-
-function toggleAll(d) {
-	if (d.children) {
-	  d.children.forEach(toggleAll);
-	  toggle(d);
-	}
-}
-
-
-
-// Toggle children.
-function toggle(d) {
-  if (d.children) {
-    d._children = d.children;
-    d.children = null;
-  } else {
-    d.children = d._children;
-    d._children = null;
-  }
-}
-
-
-</script>
-
-
-
-
-
-{% endblock the_javascript %}
-
-
-
-
diff --git a/ontospy/gendocs/media/templates/d3/d3_dendogram.html b/ontospy/gendocs/media/templates/d3/d3_dendogram.html
index 4115eec..72f1d77 100755
--- a/ontospy/gendocs/media/templates/d3/d3_dendogram.html
+++ b/ontospy/gendocs/media/templates/d3/d3_dendogram.html
@@ -5,79 +5,75 @@
 
 {% block custom_css %}
 
+	<style type="text/css" media="screen">
 
-<style type="text/css" media="screen">
+		/* rect {
+		fill: none;
+		pointer-events: all;
+		}*/
 
+		rect {
+			fill:black;
+			stroke:none;
+		}
 
+		line {
+			stroke: #000;
+			stroke-width: 1.5px;
+		}
 
-/* rect {
-fill: none;
-pointer-events: all;
-}*/
+		.string, .regexp {
+			color: #f39;
+		}
 
-rect {
-fill:black;
-stroke:none;
-}
 
-line {
-stroke: #000;
-stroke-width: 1.5px;
-}
+		/*extra css*/
 
-.string, .regexp {
-color: #f39;
-}
+		.node circle {
+		cursor: pointer;
+		fill: #fff;
+		stroke: steelblue;
+		stroke-width: 1.5px;
+		}
 
+		.node text {
+		font-size: 11px;
+		}
 
-/*extra css*/
+		path.link {
+		fill: none;
+		stroke: #ccc;
+		stroke-width: 1.5px;
+		}
 
-.node circle {
-cursor: pointer;
-fill: #fff;
-stroke: steelblue;
-stroke-width: 1.5px;
-}
 
-.node text {
-font-size: 11px;
-}
-
-path.link {
-fill: none;
-stroke: #ccc;
-stroke-width: 1.5px;
-}
+		.infoentity {
+			stroke: white;
+			stroke-width: 2.5px;
+			opacity: 0.7;
+			background: linen;
+			line-height: 0.7em;
+		}
 
 
-.infoentity {
-	stroke: white;
-	stroke-width: 2.5px;
-	opacity: 0.7;
-	background: linen;
-	line-height: 0.7em;
-}
-
-
-.smalldesc {
-	font-size: 20px;
-	margin-top: 0px;
-	color: black;
-}
-
-kbd {
-	padding: 2px 4px;
-	font-size: 90%;
-	color: #fff;
-	background-color: #333;
-	border-radius: 3px;
-	box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);
-	border-image-outset: 1;
-}
-    
+		.smalldesc {
+			font-size: 20px;
+			margin-top: 0px;
+			color: black;
+		}
 
+		kbd {
+			padding: 2px 4px;
+			font-size: 90%;
+			color: #fff;
+			background-color: #333;
+			border-radius: 3px;
+			box-shadow: inset 0 -1px 0 rgba(0,0,0,.25);
+			border-image-outset: 1;
+		}
+			
 
-</style>
+	</style>
 
 
 {% endblock custom_css %}
@@ -91,37 +87,34 @@
 {% block main_content %}
 
 
-
-	{% if TOTAL_CLASSES %}
-	<div class="row">
-		<h3>Classes ({{TOTAL_CLASSES}})</h3>
-		<div class="col-md-12" id="graph_classes">
-
-
-		</div>
-
+	<div class="row header">
+		
+		
+		
+			
+		{% if TOTAL_CLASSES %}
+			<a href="index.html" class="{% if thispage=="classes" %}active{% endif %}">Classes ({{TOTAL_CLASSES}})</a>&nbsp;&nbsp;
+		{% endif %}
+		
+		{% if TOTAL_PROPERTIES %}
+			<a href="properties.html" class="{% if thispage=="properties" %}active{% endif %}">Properties ({{TOTAL_PROPERTIES}})</a>&nbsp;&nbsp;
+		{% endif %}
+		
+		{% if TOTAL_CONCEPTS %}
+			<a href="skos.html" class="{% if thispage=="concepts" %}active{% endif %}">Concepts ({{TOTAL_CONCEPTS}})</a>
+		{% endif %}
+			
+			
+		
 
 	</div>
-	{% endif %}
-
-	{% if TOTAL_PROPERTIES %}
-	<div class="row">
-		<h3>Properties ({{TOTAL_PROPERTIES}})</h3>
-		<div class="col-md-12" id="graph_properties">
-
-
-		</div>
 
 
-	</div>
-	{% endif %}
-
-
-	{% if TOTAL_CONCEPTS %}
-
 	<div class="row">
-		<h3>Concepts ({{TOTAL_CONCEPTS}})</h3>
-		<div class="col-md-12" id="graph_concepts">
+
+		<!-- the graph -->
+		
+		<div class="col-md-12" id="the_graph">
 
 
 		</div>
@@ -129,8 +122,6 @@ <h3>Concepts ({{TOTAL_CONCEPTS}})</h3>
 
 	</div>
 
-	{% endif %}
-
 
 
 
@@ -195,14 +186,15 @@ <h3>Concepts ({{TOTAL_CONCEPTS}})</h3>
 <script type="text/javascript">
 
 //
-// CLASSES
+// LOGIC FOR ALL OBJECTS TYPES
 //
 
-{% if TOTAL_CLASSES %}
 
-	var json1 = {{JSON_DATA_CLASSES|safe}};
+{% if TOTAL_OBJECTS > 0 %}
+
+	var json1 = {{JSON_DATA_OBJECTS|safe}};
 
-	var variable_height1 = {{ TOTAL_CLASSES_TOPLAYER|d3_dendogram_height }};
+	var variable_height1 = {{ TOTAL_OBJECTS_TOPLAYER|d3_dendogram_height }};
 
 	var m = [20, 120, 100, 120],
 	    w = 2600 - m[1] - m[3],
@@ -216,7 +208,7 @@ <h3>Concepts ({{TOTAL_CONCEPTS}})</h3>
 	var diagonal1 = d3.svg.diagonal()
 	    .projection(function(d) { return [d.y, d.x]; });
 
-	var vis1 = d3.select("#graph_classes").append("svg:svg")
+	var vis1 = d3.select("#the_graph").append("svg:svg")
 	    .attr("width", w + m[1] + m[3])
 	    .attr("height", h + m[0] + m[2])
 	  	.append("svg:g")
@@ -227,7 +219,7 @@ <h3>Concepts ({{TOTAL_CONCEPTS}})</h3>
 	root_classes.y0 = 0;
 
 
-	{% if TOTAL_CLASSES > 200 %}
+	{% if TOTAL_OBJECTS > 200 %}
 
 		// Initialize the display to show no nodes:
 		root_classes.children.forEach(toggleAll);
@@ -243,106 +235,13 @@ <h3>Concepts ({{TOTAL_CONCEPTS}})</h3>
 
 
 
-//
-// PROPERTIES
-//
-
-
-{% if TOTAL_PROPERTIES %}
-
-
-	var json2 = {{JSON_DATA_PROPERTIES|safe}};
-
-
-	var variable_height2 = {{ TOTAL_PROPERTIES_TOPLAYER|d3_dendogram_height }};
-
-	var m = [20, 120, 100, 120],
-	    w = 2600 - m[1] - m[3],
-	    h = variable_height2 - m[0] - m[2],
-	    i = 0,
-	    root_properties;
-
-	var tree2 = d3.layout.tree()
-	    .size([h, w]);
-
-	var diagonal2 = d3.svg.diagonal()
-	    .projection(function(d) { return [d.y, d.x]; });
-
-	var vis2 = d3.select("#graph_properties").append("svg:svg")
-	    .attr("width", w + m[1] + m[3])
-	    .attr("height", h + m[0] + m[2])
-	  	.append("svg:g")
-	    .attr("transform", "translate(" + m[3] + "," + m[0] + ")");
-
-	root_properties = json2;
-	root_properties.x0 = h / 2;
-	root_properties.y0 = 0;
-
-	{% if TOTAL_PROPERTIES > 200 %}
-
-		// Initialize the display to show no nodes:
-		root_properties.children.forEach(toggleAll);
-	{% endif %}
-
-
-	update(vis2, tree2, diagonal2, root_properties, json2);
-
-{% endif %}
-
-
-
-
-
-{% if TOTAL_CONCEPTS %}
-
-	var json3 = {{JSON_DATA_CONCEPTS|safe}};
-
-	var variable_height3 = {{ TOTAL_CONCEPTS_TOPLAYER|d3_dendogram_height }};
-
-	var m = [20, 120, 100, 120],
-	    w = 2600 - m[1] - m[3],
-	    h = variable_height3 - m[0] - m[2],
-	    i = 0,
-	    root_concepts;
-
-	var tree3 = d3.layout.tree()
-	    .size([h, w]);
-
-	var diagonal3 = d3.svg.diagonal()
-	    .projection(function(d) { return [d.y, d.x]; });
-
-	var vis3 = d3.select("#graph_concepts").append("svg:svg")
-	    .attr("width", w + m[1] + m[3])
-	    .attr("height", h + m[0] + m[2])
-	    .append("svg:g")
-	    .attr("transform", "translate(" + m[3] + "," + m[0] + ")");
-
-	root_concepts = json3;
-	root_concepts.x0 = h / 2;
-	root_concepts.y0 = 0;
-
-
-
-	{% if TOTAL_CONCEPTS > 200 %}
-		// Initialize the display to show no nodes:
-		root_concepts.children.forEach(toggleAll);
-	{% endif %}
-
-
-
-	update(vis3, tree3, diagonal3, root_concepts, json3);
-
-
-{% endif %}
-
-
 
 //
 //  SHARED FUNCTIONS
 //
 
 
-// mikele: added more args [vis, tree, diagonal, root] which originally were referenced as a Global var
+// added more args [vis, tree, diagonal, root] which originally were referenced as a Global var
 function update(vis, tree, diagonal, source, root) {
 
   var duration = d3.event && d3.event.altKey ? 5000 : 500;
diff --git a/ontospy/gendocs/media/templates/d3/d3_pack_hierarchy.html b/ontospy/gendocs/media/templates/d3/d3_pack_hierarchy.html
index 6f2ea6c..703e180 100755
--- a/ontospy/gendocs/media/templates/d3/d3_pack_hierarchy.html
+++ b/ontospy/gendocs/media/templates/d3/d3_pack_hierarchy.html
@@ -36,11 +36,6 @@
   stroke-width: .5px;
 }
 
-{#note: June 20, 2016 removed to allow mousetips on all circles #}
-{#circle.child {#}
-{#  pointer-events: none;#}
-{# } #}
-
 
 circle.child:hover {
   stroke: #ff7f0e;
@@ -98,22 +93,45 @@
 
 
 
+
 {% block main_content %}
 
 
+	<div class="row header">
+		
+		
+		
+			
+		{% if TOTAL_CLASSES %}
+			<a href="index.html" class="{% if thispage=="classes" %}active{% endif %}">Classes ({{TOTAL_CLASSES}})</a>&nbsp;&nbsp;
+		{% endif %}
+		
+		{% if TOTAL_PROPERTIES %}
+			<a href="properties.html" class="{% if thispage=="properties" %}active{% endif %}">Properties ({{TOTAL_PROPERTIES}})</a>&nbsp;&nbsp;
+		{% endif %}
+		
+		{% if TOTAL_CONCEPTS %}
+			<a href="skos.html" class="{% if thispage=="concepts" %}active{% endif %}">Concepts ({{TOTAL_CONCEPTS}})</a>
+		{% endif %}
+			
+			
+		
 
+	</div>
 
-	{% if TOTAL_CLASSES %}
-		<div class="row">
-			<h3>Classes ({{TOTAL_CLASSES}})</h3>
-			<div class="col-md-12" id="graph_classes">
 
+	<div class="row">
 
-			</div>
+		<!-- the graph -->
+		
+		<div class="col-md-12" id="the_graph">
 
 
 		</div>
-	{% endif %}
+
+
+	</div>
+
 
 
 
@@ -121,6 +139,7 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
 
 
 
+
 {% block extra_footer %}
 
 Visualization developed with <a class="greylink" href="https://github.com/d3/d3">d3.js</a>.
@@ -152,7 +171,7 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
 
 <script type="text/javascript">
 
-    var data = {{JSON_DATA_CLASSES|safe}};
+    var data = {{JSON_DATA_OBJECTS|safe}};
 
     var w = 1280,
         h = 800,
@@ -167,7 +186,7 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
         .size([r, r])
         .value(function(d) { return d.size; });
 
-    var vis = d3.select("#graph_classes").insert("svg:svg", "h2")
+    var vis = d3.select("#the_graph").insert("svg:svg", "h2")
         .attr("width", w)
         .attr("height", h)
         .append("svg:g")
@@ -187,7 +206,6 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
 	    .text("a simple tooltip");
 
 
-{#    d3.json("flare.json", function(data) {#}
     node = root = data;
 
     var nodes = pack.nodes(data);
@@ -230,7 +248,6 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
 
       d3.select(window).on("click", function() { zoom(root); });
 
-{#    });#}
 
     function zoom(d, i) {
       var k = r / d.r / 2;
diff --git a/ontospy/gendocs/media/templates/d3/d3_partition_table.html b/ontospy/gendocs/media/templates/d3/d3_partition_table.html
index 6a8b079..963502e 100755
--- a/ontospy/gendocs/media/templates/d3/d3_partition_table.html
+++ b/ontospy/gendocs/media/templates/d3/d3_partition_table.html
@@ -9,13 +9,6 @@
 
 <style type="text/css" media="screen">
 
- body {
-  background: url(texture-noise.png);
-{#  overflow: hidden;#}
-  margin: 10px;
-  font-size: 14px;
-  font-family: "Helvetica Neue", Helvetica;
-}
 
 #chart, #header, #footer {
   position: absolute;
@@ -138,31 +131,53 @@
 {% block main_content %}
 
 
+	<div class="row header">
+		
+		
+		
+			
+		{% if TOTAL_CLASSES %}
+			<a href="index.html" class="{% if thispage=="classes" %}active{% endif %}">Classes ({{TOTAL_CLASSES}})</a>&nbsp;&nbsp;
+		{% endif %}
+		
+		{% if TOTAL_PROPERTIES %}
+			<a href="properties.html" class="{% if thispage=="properties" %}active{% endif %}">Properties ({{TOTAL_PROPERTIES}})</a>&nbsp;&nbsp;
+		{% endif %}
+		
+		{% if TOTAL_CONCEPTS %}
+			<a href="skos.html" class="{% if thispage=="concepts" %}active{% endif %}">Concepts ({{TOTAL_CONCEPTS}})</a>
+		{% endif %}
+			
+			
+		
+
+	</div>
 
-	{% if TOTAL_CLASSES %}
-		<div class="row">
-			<h3>Classes ({{TOTAL_CLASSES}})</h3>
-			<div class="col-md-12" id="graph_classes" style="margin-top: 10px;">
 
+	<div class="row">
 
-			</div>
+		<!-- the graph -->
+		
+		<div class="col-md-12" id="the_graph">
 
 
 		</div>
-	{% endif %}
+
+
+	</div>
 
 
 
 
-	{% endblock main_content %}
+{% endblock main_content %}
 
 
 
-	{% block extra_footer %}
+{% block extra_footer %}
 
 	Visualization developed with <a class="greylink" href="https://github.com/d3/d3">d3.js</a>.
 	
-	{% endblock extra_footer %}
+{% endblock extra_footer %}
 	
 	
 
@@ -197,7 +212,7 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
 
 <script type="text/javascript">
 
-    var root = {{JSON_DATA_CLASSES|safe}} ;
+    var root = {{JSON_DATA_OBJECTS|safe}} ;
 
 	var w = window.innerWidth;
 	var h = window.innerHeight;
@@ -208,7 +223,7 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
 	var x = d3.scale.linear().range([0, w]),
 	    y = d3.scale.linear().range([0, h]);
 
-	var vis = d3.select("#graph_classes").append("div")
+	var vis = d3.select("#the_graph").append("div")
 	    .attr("class", "chart")
 	    .style("width", w + "px")
 	    .style("height", h + "px")
diff --git a/ontospy/gendocs/media/templates/d3/d3_rotating_cluster.html b/ontospy/gendocs/media/templates/d3/d3_rotating_cluster.html
index a30ab08..fc84a98 100755
--- a/ontospy/gendocs/media/templates/d3/d3_rotating_cluster.html
+++ b/ontospy/gendocs/media/templates/d3/d3_rotating_cluster.html
@@ -9,67 +9,61 @@
 <style type="text/css" media="screen">
 
 
-path.arc {
-  cursor: move;
-  fill: #fff;
-}
-
-.node circle {
-  fill: #fff;
-  stroke: steelblue;
-  stroke-width: 1.5px;
-}
-
-.node {
-  font-size: 10px;
-  pointer-events: none;
-}
-
-.link {
-  fill: none;
-  stroke: #ccc;
-  stroke-width: 1.5px;
-}
-
-
-text {
-  font-size: 11px;
-  pointer-events: none;
-}
-
-text.parent {
-  fill: #1f77b4;
-}
-
-circle {
-  fill: #ccc;
-  stroke: #999;
-  pointer-events: all;
-}
-
-circle.parent {
-  fill: #1f77b4;
-  fill-opacity: .1;
-  stroke: steelblue;
-}
-
-circle.parent:hover {
-  stroke: #ff7f0e;
-  stroke-width: .5px;
-}
-
-{#note: June 20, 2016 removed to allow mousetips on all circles #}
-{#circle.child {#}
-{#  pointer-events: none;#}
-{# } #}
-
-
-circle.child:hover {
-  stroke: #ff7f0e;
-  stroke-width: .5px;
-  fill: #eaeaea;
-  fill-opacity: .9;
-}
+    path.arc {
+      cursor: move;
+      fill: #fff;
+    }
+
+    .node circle {
+      fill: #fff;
+      stroke: steelblue;
+      stroke-width: 1.5px;
+    }
+
+    .node {
+      font-size: 10px;
+      pointer-events: none;
+    }
+
+    .link {
+      fill: none;
+      stroke: #ccc;
+      stroke-width: 1.5px;
+    }
+
+
+    text {
+      font-size: 11px;
+      pointer-events: none;
+    }
+
+    text.parent {
+      fill: #1f77b4;
+    }
+
+    circle {
+      fill: #ccc;
+      stroke: #999;
+      pointer-events: all;
+    }
+
+    circle.parent {
+      fill: #1f77b4;
+      fill-opacity: .1;
+      stroke: steelblue;
+    }
+
+    circle.parent:hover {
+      stroke: #ff7f0e;
+      stroke-width: .5px;
+    }
+
+    circle.child:hover {
+      stroke: #ff7f0e;
+      stroke-width: .5px;
+      fill: #eaeaea;
+      fill-opacity: .9;
+    }
 
 
 
@@ -83,23 +77,51 @@
 
 
 
+{% block main_content %}
+
 
-  {% block main_content %}
+	<div class="row header">
+		
+		
+		
+			
+		{% if TOTAL_CLASSES %}
+			<a href="index.html" class="{% if thispage=="classes" %}active{% endif %}">Classes ({{TOTAL_CLASSES}})</a>&nbsp;&nbsp;
+		{% endif %}
+		
+		{% if TOTAL_PROPERTIES %}
+			<a href="properties.html" class="{% if thispage=="properties" %}active{% endif %}">Properties ({{TOTAL_PROPERTIES}})</a>&nbsp;&nbsp;
+		{% endif %}
+		
+		{% if TOTAL_CONCEPTS %}
+			<a href="skos.html" class="{% if thispage=="concepts" %}active{% endif %}">Concepts ({{TOTAL_CONCEPTS}})</a>
+		{% endif %}
+			
+			
+		
 
+	</div>
 
-	{% if TOTAL_CLASSES %}
-		<div class="row">
-			<h3>Classes ({{TOTAL_CLASSES}})</h3>
-			<div class="col-md-12" id="graph_classes" style="margin-top: 10px;">
 
+	<div class="row">
 
-			</div>
+		<!-- the graph -->
+		
+		<div class="col-md-12" id="the_graph">
 
 
 		</div>
-	{% endif %}
 
-  {% endblock main_content %}
+
+	</div>
+
+
+
+
+{% endblock main_content %}
+
+
+
 
 
 
@@ -141,10 +163,10 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
 
 <script type="text/javascript">
 
-    var json = {{JSON_DATA_CLASSES|safe}} ;
+    var json = {{JSON_DATA_OBJECTS|safe}} ;
 
-    var w = 1400,
-	    h = 1100,
+    var w = 1600,
+	    h = 1200,
 	    rx = w / 4,
 	    ry = h / 4,
 	    m0,
@@ -157,7 +179,7 @@ <h3>Classes ({{TOTAL_CLASSES}})</h3>
     var diagonal = d3.svg.diagonal.radial()
         .projection(function(d) { return [d.y, d.x / 180 * Math.PI]; });
 
-    var svg = d3.select("#graph_classes").append("div")
+    var svg = d3.select("#the_graph").append("div")
         .style("width", w + "px")
         .style("height", w + "px");
 
diff --git a/ontospy/gendocs/media/templates/html-single/html-single.html b/ontospy/gendocs/media/templates/html-single/html-single.html
index 0db5df2..19175ae 100755
--- a/ontospy/gendocs/media/templates/html-single/html-single.html
+++ b/ontospy/gendocs/media/templates/html-single/html-single.html
@@ -228,20 +228,25 @@
 
 <body>
 
-
-	
-	{% if ontologies|length > 1 %}
-	<h1 class="title">{{docs_title}}</a></h1>
+	{% if ontologies%}
 	
-		{% for o in ontologies  %}
-			<h3><li>{{o.uri}}</li></h3>
-		{% endfor %}
+		{% if ontologies|length > 1 %}
+			<h1 class="title">{{docs_title}}</a></h1>
 			
+				{% for o in ontologies  %}
+					<h3><li>{{o.uri}}</li></h3>
+				{% endfor %}
+					
+		{% else %}
+			<h1 class="title"><a href="{{main_uri}}" target="_blank">{{docs_title}}</a></h1>
+			<h3>{{ontologies.0.bestDescription()|linebreaks}}</h3>
+		{% endif %}
+
 	{% else %}
-	<h1 class="title"><a href="{{main_uri}}" target="_blank">{{docs_title}}</a></h1>
-	<h3>{{ontologies.0.bestDescription()|linebreaks}}</h3>
+		<h1 class="title">{{docs_title}}</h1>
 	{% endif %}
 		
+		
 
 
 	<p><small>Ontology documentation automatically generated by <a class="greylink" href="http://lambdamusic.github.io/Ontospy/">Ontospy</a> on {% now 'utc', '%a, %d %b %Y %H:%M:%S' %}</small></p>
diff --git a/ontospy/gendocs/media/templates/shared/d3_base.html b/ontospy/gendocs/media/templates/shared/d3_base.html
index 1ab1aa0..09e1f54 100644
--- a/ontospy/gendocs/media/templates/shared/d3_base.html
+++ b/ontospy/gendocs/media/templates/shared/d3_base.html
@@ -106,6 +106,16 @@
         font-size: smaller;
     }
 
+    .header {
+        font-size: 15px;
+        margin-bottom: 30px;
+    }
+    a.active {
+        font-weight: bold;
+        color: black;
+    }
+
+
 </style>
 
 
diff --git a/ontospy/gendocs/viz/viz_d3bar_hierarchy.py b/ontospy/gendocs/viz/viz_d3bar_hierarchy.py
index 5c8ff9c..389c586 100755
--- a/ontospy/gendocs/viz/viz_d3bar_hierarchy.py
+++ b/ontospy/gendocs/viz/viz_d3bar_hierarchy.py
@@ -31,26 +31,109 @@ def _buildTemplates(self):
         OVERRIDING THIS METHOD from Factory
         """
 
-        jsontree_classes = build_D3treeStandard(
-            0, 99, 1, self.ontospy_graph.toplayer_classes)
         c_total = len(self.ontospy_graph.all_classes)
-
-        JSON_DATA_CLASSES = json.dumps({
-            'children': jsontree_classes,
-            'name': 'owl:Thing',
-        })
-
-        extra_context = {
-            "ontograph": self.ontospy_graph,
-            "TOTAL_CLASSES": c_total,
-            'JSON_DATA_CLASSES': JSON_DATA_CLASSES,
-        }
-
-        # Ontology - MAIN PAGE
-        contents = self._renderTemplate(
-            "d3/d3_bar_hierarchy.html", extraContext=extra_context)
-        FILE_NAME = "index.html"
-        main_url = self._save2File(contents, FILE_NAME, self.output_path)
+        p_total = len(self.ontospy_graph.all_properties)
+        s_total = len(self.ontospy_graph.all_skos_concepts)
+
+        main_url = None
+
+
+        if c_total:
+            c_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_classes)
+            # hack to make sure that we have a default top level object
+            JSON_DATA_CLASSES = json.dumps({
+                'children': c_mylist,
+                'name': 'owl:Thing',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "classes",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": c_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_classes),
+                'JSON_DATA_OBJECTS': JSON_DATA_CLASSES,
+            }
+
+            # Classes - MAIN PAGE
+            contents = self._renderTemplate(
+                "d3/d3_bar_hierarchy.html", extraContext=extra_context)
+            
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "classes.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+            
+
+
+        if p_total:
+            p_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_properties)
+            JSON_DATA_PROPERTIES = json.dumps({
+                'children': p_mylist,
+                'name': 'Properties',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "properties",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": p_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_properties),
+                'JSON_DATA_OBJECTS': JSON_DATA_PROPERTIES,
+            }
+
+            # Properties PAGE
+            contents = self._renderTemplate(
+                "d3/d3_bar_hierarchy.html", extraContext=extra_context)
+            
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "properties.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+            
+
+        if s_total:
+            s_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_skos)
+            JSON_DATA_CONCEPTS = json.dumps({
+                'children': s_mylist,
+                'name': 'Concepts',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "concepts",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": s_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_skos),
+                'JSON_DATA_OBJECTS': JSON_DATA_CONCEPTS,
+            }
+
+            # Concepts PAGE
+            contents = self._renderTemplate(
+                "d3/d3_bar_hierarchy.html", extraContext=extra_context)
+
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "skos.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
 
         return main_url
 
diff --git a/ontospy/gendocs/viz/viz_d3bubble_chart.py b/ontospy/gendocs/viz/viz_d3bubble_chart.py
index bd47633..f2cb51c 100755
--- a/ontospy/gendocs/viz/viz_d3bubble_chart.py
+++ b/ontospy/gendocs/viz/viz_d3bubble_chart.py
@@ -31,28 +31,111 @@ def _buildTemplates(self):
         OVERRIDING THIS METHOD from Factory
         """
 
-        jsontree_classes = build_D3bubbleChart(
-            0, 99, 1, self.ontospy_graph.toplayer_classes)
         c_total = len(self.ontospy_graph.all_classes)
-
-        JSON_DATA_CLASSES = json.dumps({
-            'children': jsontree_classes,
-            'name': 'owl:Thing',
-        })
-
-        extra_context = {
-            "ontograph": self.ontospy_graph,
-            "TOTAL_CLASSES": c_total,
-            'JSON_DATA_CLASSES': JSON_DATA_CLASSES,
-        }
-
-        # Ontology - MAIN PAGE
-        contents = self._renderTemplate(
-            "d3/d3_bubble_chart.html", extraContext=extra_context)
-        FILE_NAME = "index.html"
-        main_url = self._save2File(contents, FILE_NAME, self.output_path)
+        p_total = len(self.ontospy_graph.all_properties)
+        s_total = len(self.ontospy_graph.all_skos_concepts)
+
+        main_url = None
+
+        if c_total:
+            c_mylist = build_D3bubbleChart(0, 99, 1,
+                                            self.ontospy_graph.toplayer_classes)
+            # hack to make sure that we have a default top level object
+            JSON_DATA_CLASSES = json.dumps({
+                'children': c_mylist,
+                'name': 'owl:Thing',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "classes",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": c_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_classes),
+                'JSON_DATA_OBJECTS': JSON_DATA_CLASSES,
+            }
+
+            # Classes - MAIN PAGE
+            contents = self._renderTemplate(
+                "d3/d3_bubble_chart.html", extraContext=extra_context)
+            
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "classes.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+            
+
+
+        if p_total:
+            p_mylist = build_D3bubbleChart(0, 99, 1,
+                                            self.ontospy_graph.toplayer_properties)
+            JSON_DATA_PROPERTIES = json.dumps({
+                'children': p_mylist,
+                'name': 'Properties',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "properties",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": p_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_properties),
+                'JSON_DATA_OBJECTS': JSON_DATA_PROPERTIES,
+            }
+
+            # Properties PAGE
+            contents = self._renderTemplate(
+                "d3/d3_bubble_chart.html", extraContext=extra_context)
+            
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "properties.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+            
+
+        if s_total:
+            s_mylist = build_D3bubbleChart(0, 99, 1,
+                                            self.ontospy_graph.toplayer_skos)
+            JSON_DATA_CONCEPTS = json.dumps({
+                'children': s_mylist,
+                'name': 'Concepts',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "concepts",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": s_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_skos),
+                'JSON_DATA_OBJECTS': JSON_DATA_CONCEPTS,
+            }
+
+            # Concepts PAGE
+            contents = self._renderTemplate(
+                "d3/d3_bubble_chart.html", extraContext=extra_context)
+
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "skos.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
 
         return main_url
+        
 
 
 # if called directly, for testing purposes pick a random ontology
diff --git a/ontospy/gendocs/viz/viz_d3dendogram.py b/ontospy/gendocs/viz/viz_d3dendogram.py
index 60cc2bc..d1633bc 100755
--- a/ontospy/gendocs/viz/viz_d3dendogram.py
+++ b/ontospy/gendocs/viz/viz_d3dendogram.py
@@ -32,17 +32,13 @@ def _buildTemplates(self):
         OVERRIDING THIS METHOD from Factory
         """
 
-        c_mylist = build_D3treeStandard(0, 99, 1,
-                                        self.ontospy_graph.toplayer_classes)
-        p_mylist = build_D3treeStandard(0, 99, 1,
-                                        self.ontospy_graph.toplayer_properties)
-        s_mylist = build_D3treeStandard(0, 99, 1,
-                                        self.ontospy_graph.toplayer_skos)
-
         c_total = len(self.ontospy_graph.all_classes)
         p_total = len(self.ontospy_graph.all_properties)
         s_total = len(self.ontospy_graph.all_skos_concepts)
 
+        main_url = None
+
+
         if False:
             # testing how a single tree would look like
             JSON_DATA_CLASSES = json.dumps({
@@ -67,41 +63,103 @@ def _buildTemplates(self):
                 "root"
             })
 
-        # hack to make sure that we have a default top level object
-        JSON_DATA_CLASSES = json.dumps({
-            'children': c_mylist,
-            'name': 'owl:Thing',
-            'id': "None"
-        })
-        JSON_DATA_PROPERTIES = json.dumps({
-            'children': p_mylist,
-            'name': 'Properties',
-            'id': "None"
-        })
-        JSON_DATA_CONCEPTS = json.dumps({
-            'children': s_mylist,
-            'name': 'Concepts',
-            'id': "None"
-        })
-
-        extra_context = {
-            "ontograph": self.ontospy_graph,
-            "TOTAL_CLASSES": c_total,
-            "TOTAL_PROPERTIES": p_total,
-            "TOTAL_CONCEPTS": s_total,
-            "TOTAL_CLASSES_TOPLAYER": len(self.ontospy_graph.toplayer_classes),
-            "TOTAL_PROPERTIES_TOPLAYER": len(self.ontospy_graph.toplayer_properties),
-            "TOTAL_CONCEPTS_TOPLAYER": len(self.ontospy_graph.toplayer_skos),
-            'JSON_DATA_CLASSES': JSON_DATA_CLASSES,
-            'JSON_DATA_PROPERTIES': JSON_DATA_PROPERTIES,
-            'JSON_DATA_CONCEPTS': JSON_DATA_CONCEPTS,
-        }
-
-        # Ontology - MAIN PAGE
-        contents = self._renderTemplate(
-            "d3/d3_dendogram.html", extraContext=extra_context)
-        FILE_NAME = "index.html"
-        main_url = self._save2File(contents, FILE_NAME, self.output_path)
+        if c_total:
+            c_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_classes)
+            # hack to make sure that we have a default top level object
+            JSON_DATA_CLASSES = json.dumps({
+                'children': c_mylist,
+                'name': 'owl:Thing',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "classes",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": c_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_classes),
+                'JSON_DATA_OBJECTS': JSON_DATA_CLASSES,
+            }
+
+            # Classes - MAIN PAGE
+            contents = self._renderTemplate(
+                "d3/d3_dendogram.html", extraContext=extra_context)
+            
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "classes.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+            
+
+
+        if p_total:
+            p_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_properties)
+            JSON_DATA_PROPERTIES = json.dumps({
+                'children': p_mylist,
+                'name': 'Properties',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "properties",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": p_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_properties),
+                'JSON_DATA_OBJECTS': JSON_DATA_PROPERTIES,
+            }
+
+            # Properties PAGE
+            contents = self._renderTemplate(
+                "d3/d3_dendogram.html", extraContext=extra_context)
+            
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "properties.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+            
+
+        if s_total:
+            s_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_skos)
+            JSON_DATA_CONCEPTS = json.dumps({
+                'children': s_mylist,
+                'name': 'Concepts',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "concepts",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": s_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_skos),
+                'JSON_DATA_OBJECTS': JSON_DATA_CONCEPTS,
+            }
+
+            # Concepts PAGE
+            contents = self._renderTemplate(
+                "d3/d3_dendogram.html", extraContext=extra_context)
+
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "skos.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+
 
         return main_url
 
diff --git a/ontospy/gendocs/viz/viz_d3pack_hierarchy.py b/ontospy/gendocs/viz/viz_d3pack_hierarchy.py
index 9ccce6c..a2bdb2d 100644
--- a/ontospy/gendocs/viz/viz_d3pack_hierarchy.py
+++ b/ontospy/gendocs/viz/viz_d3pack_hierarchy.py
@@ -32,35 +32,139 @@ def _buildTemplates(self):
         OVERRIDING THIS METHOD from Factory
         """
 
-        jsontree_classes = build_D3treeStandard(
-            0, 99, 1, self.ontospy_graph.toplayer_classes)
         c_total = len(self.ontospy_graph.all_classes)
+        p_total = len(self.ontospy_graph.all_properties)
+        s_total = len(self.ontospy_graph.all_skos_concepts)
 
-        if len(self.ontospy_graph.toplayer_classes) == 1:
-            # the first element can be the single top level
-            JSON_DATA_CLASSES = json.dumps(jsontree_classes[0])
-        else:
+        main_url = None
+
+
+        if False:
+            # testing how a single tree would look like
+            JSON_DATA_CLASSES = json.dumps({
+                'children': [{
+                    'children': c_mylist,
+                    'name': 'Classes',
+                    'id': "classes"
+                },
+                             {
+                                 'children': p_mylist,
+                                 'name': 'Properties',
+                                 'id': "properties"
+                             },
+                             {
+                                 'children': s_mylist,
+                                 'name': 'Concepts',
+                                 'id': "concepts"
+                             }],
+                'name':
+                'Entities',
+                'id':
+                "root"
+            })
+
+        if c_total:
+            c_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_classes)
             # hack to make sure that we have a default top level object
             JSON_DATA_CLASSES = json.dumps({
-                'children': jsontree_classes,
+                'children': c_mylist,
                 'name': 'owl:Thing',
+                'id': "None"
             })
 
-        extra_context = {
-            "ontograph": self.ontospy_graph,
-            "TOTAL_CLASSES": c_total,
-            'JSON_DATA_CLASSES': JSON_DATA_CLASSES,
-        }
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "classes",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": c_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_classes),
+                'JSON_DATA_OBJECTS': JSON_DATA_CLASSES,
+            }
+
+            # Classes - MAIN PAGE
+            contents = self._renderTemplate(
+                "d3/d3_pack_hierarchy.html", extraContext=extra_context)
+            
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "classes.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+            
+
+
+        if p_total:
+            p_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_properties)
+            JSON_DATA_PROPERTIES = json.dumps({
+                'children': p_mylist,
+                'name': 'Properties',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "properties",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": p_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_properties),
+                'JSON_DATA_OBJECTS': JSON_DATA_PROPERTIES,
+            }
+
+            # Properties PAGE
+            contents = self._renderTemplate(
+                "d3/d3_pack_hierarchy.html", extraContext=extra_context)
+            
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "properties.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+            
+
+        if s_total:
+            s_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_skos)
+            JSON_DATA_CONCEPTS = json.dumps({
+                'children': s_mylist,
+                'name': 'Concepts',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "concepts",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": s_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_skos),
+                'JSON_DATA_OBJECTS': JSON_DATA_CONCEPTS,
+            }
+
+            # Concepts PAGE
+            contents = self._renderTemplate(
+                "d3/d3_pack_hierarchy.html", extraContext=extra_context)
+
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "skos.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
 
-        # Ontology - MAIN PAGE
-        contents = self._renderTemplate(
-            "d3/d3_pack_hierarchy.html", extraContext=extra_context)
-        FILE_NAME = "index.html"
-        main_url = self._save2File(contents, FILE_NAME, self.output_path)
 
         return main_url
 
 
+
 # if called directly, for testing purposes pick a random ontology
 
 if __name__ == '__main__':
diff --git a/ontospy/gendocs/viz/viz_d3partition_table.py b/ontospy/gendocs/viz/viz_d3partition_table.py
index 6e11ced..646fc98 100755
--- a/ontospy/gendocs/viz/viz_d3partition_table.py
+++ b/ontospy/gendocs/viz/viz_d3partition_table.py
@@ -31,30 +31,112 @@ def _buildTemplates(self):
         OVERRIDING THIS METHOD from Factory
         """
 
-        jsontree_classes = build_D3treeStandard(
-            0, 99, 1, self.ontospy_graph.toplayer_classes)
         c_total = len(self.ontospy_graph.all_classes)
+        p_total = len(self.ontospy_graph.all_properties)
+        s_total = len(self.ontospy_graph.all_skos_concepts)
+
+        main_url = None
+
+        if c_total:
+            c_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_classes)
+            # hack to make sure that we have a default top level object
+            JSON_DATA_CLASSES = json.dumps({
+                'children': c_mylist,
+                'name': 'owl:Thing',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "classes",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": c_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_classes),
+                'JSON_DATA_OBJECTS': JSON_DATA_CLASSES,
+            }
+
+            # Classes - MAIN PAGE
+            contents = self._renderTemplate(
+                "d3/d3_partition_table.html", extraContext=extra_context)
+            
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "classes.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+            
+
+
+        if p_total:
+            p_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_properties)
+            JSON_DATA_PROPERTIES = json.dumps({
+                'children': p_mylist,
+                'name': 'Properties',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "properties",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": p_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_properties),
+                'JSON_DATA_OBJECTS': JSON_DATA_PROPERTIES,
+            }
+
+            # Properties PAGE
+            contents = self._renderTemplate(
+                "d3/d3_partition_table.html", extraContext=extra_context)
+            
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "properties.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+            
+
+        if s_total:
+            s_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_skos)
+            JSON_DATA_CONCEPTS = json.dumps({
+                'children': s_mylist,
+                'name': 'Concepts',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "concepts",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": s_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_skos),
+                'JSON_DATA_OBJECTS': JSON_DATA_CONCEPTS,
+            }
+
+            # Concepts PAGE
+            contents = self._renderTemplate(
+                "d3/d3_partition_table.html", extraContext=extra_context)
+
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "skos.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
 
-        JSON_DATA_CLASSES = json.dumps({
-            'children': jsontree_classes,
-            'name': 'owl:Thing',
-        })
-
-        extra_context = {
-            "ontograph": self.ontospy_graph,
-            "TOTAL_CLASSES": c_total,
-            'JSON_DATA_CLASSES': JSON_DATA_CLASSES,
-        }
-
-        # Ontology - MAIN PAGE
-        contents = self._renderTemplate(
-            "d3/d3_partition_table.html", extraContext=extra_context)
-        FILE_NAME = "index.html"
-        main_url = self._save2File(contents, FILE_NAME, self.output_path)
 
         return main_url
 
-
 # if called directly, for testing purposes pick a random ontology
 
 if __name__ == '__main__':
diff --git a/ontospy/gendocs/viz/viz_d3rotating_cluster.py b/ontospy/gendocs/viz/viz_d3rotating_cluster.py
index f4ca083..bdeb853 100755
--- a/ontospy/gendocs/viz/viz_d3rotating_cluster.py
+++ b/ontospy/gendocs/viz/viz_d3rotating_cluster.py
@@ -33,30 +33,113 @@ def _buildTemplates(self):
         OVERRIDING THIS METHOD from Factory
         """
 
-        jsontree_classes = build_D3treeStandard(
-            0, 99, 1, self.ontospy_graph.toplayer_classes)
         c_total = len(self.ontospy_graph.all_classes)
+        p_total = len(self.ontospy_graph.all_properties)
+        s_total = len(self.ontospy_graph.all_skos_concepts)
+
+        main_url = None
+
+        if c_total:
+            c_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_classes)
+            # hack to make sure that we have a default top level object
+            JSON_DATA_CLASSES = json.dumps({
+                'children': c_mylist,
+                'name': 'owl:Thing',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "classes",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": c_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_classes),
+                'JSON_DATA_OBJECTS': JSON_DATA_CLASSES,
+            }
+
+            # Classes - MAIN PAGE
+            contents = self._renderTemplate(
+                "d3/d3_rotating_cluster.html", extraContext=extra_context)
+            
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "classes.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+            
+
+
+        if p_total:
+            p_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_properties)
+            JSON_DATA_PROPERTIES = json.dumps({
+                'children': p_mylist,
+                'name': 'Properties',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "properties",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": p_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_properties),
+                'JSON_DATA_OBJECTS': JSON_DATA_PROPERTIES,
+            }
+
+            # Properties PAGE
+            contents = self._renderTemplate(
+                "d3/d3_rotating_cluster.html", extraContext=extra_context)
+            
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "properties.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
+            
+
+        if s_total:
+            s_mylist = build_D3treeStandard(0, 99, 1,
+                                            self.ontospy_graph.toplayer_skos)
+            JSON_DATA_CONCEPTS = json.dumps({
+                'children': s_mylist,
+                'name': 'Concepts',
+                'id': "None"
+            })
+
+            extra_context = {
+                "ontograph": self.ontospy_graph,
+                "thispage": "concepts",
+                "TOTAL_CLASSES": c_total,
+                "TOTAL_PROPERTIES": p_total,
+                "TOTAL_CONCEPTS": s_total,
+                "TOTAL_OBJECTS": s_total,
+                "TOTAL_OBJECTS_TOPLAYER": len(self.ontospy_graph.toplayer_skos),
+                'JSON_DATA_OBJECTS': JSON_DATA_CONCEPTS,
+            }
+
+            # Concepts PAGE
+            contents = self._renderTemplate(
+                "d3/d3_rotating_cluster.html", extraContext=extra_context)
+
+            if not main_url: 
+                FILE_NAME = "index.html"
+                main_url = self._save2File(contents, FILE_NAME, self.output_path)
+            else:
+                FILE_NAME = "skos.html"
+                self._save2File(contents, FILE_NAME, self.output_path)
 
-        JSON_DATA_CLASSES = json.dumps({
-            'children': jsontree_classes,
-            'name': 'owl:Thing',
-        })
-
-        extra_context = {
-            "ontograph": self.ontospy_graph,
-            "TOTAL_CLASSES": c_total,
-            'JSON_DATA_CLASSES': JSON_DATA_CLASSES,
-        }
-
-        # Ontology - MAIN PAGE
-        contents = self._renderTemplate(
-            "d3/d3_rotating_cluster.html", extraContext=extra_context)
-        FILE_NAME = "index.html"
-        main_url = self._save2File(contents, FILE_NAME, self.output_path)
 
         return main_url
 
-
+        
 # if called directly, for testing purposes pick a random ontology
 
 if __name__ == '__main__':