diff --git a/pom.xml b/pom.xml
index 5d8e81b68..7333a70de 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
 
     <groupId>com.atomgraph</groupId>
     <artifactId>linkeddatahub</artifactId>
-    <version>5.0.4-SNAPSHOT</version>
+    <version>5.0.5-SNAPSHOT</version>
     <packaging>${packaging.type}</packaging>
 
     <name>AtomGraph LinkedDataHub</name>
diff --git a/scripts/add-object-block.sh b/scripts/add-object-block.sh
index d0bc7bcef..5e2d7e2f3 100755
--- a/scripts/add-object-block.sh
+++ b/scripts/add-object-block.sh
@@ -91,10 +91,6 @@ if [ -z "$base" ] ; then
     print_usage
     exit 1
 fi
-if [ -z "$title" ] ; then
-    print_usage
-    exit 1
-fi
 if [ -z "$value" ] ; then
     print_usage
     exit 1
diff --git a/scripts/add-view-block.sh b/scripts/add-view.sh
similarity index 82%
rename from scripts/add-view-block.sh
rename to scripts/add-view.sh
index a693e5f05..3d1a0e804 100755
--- a/scripts/add-view-block.sh
+++ b/scripts/add-view.sh
@@ -36,11 +36,6 @@ do
         shift # past argument
         shift # past value
         ;;
-        --proxy)
-        proxy="$2"
-        shift # past argument
-        shift # past value
-        ;;
         -b|--base)
         base="$2"
         shift # past argument
@@ -96,20 +91,6 @@ if [ -z "$query" ] ; then
     exit 1
 fi
 
-target="$1"
-
-ntriples=$(./get.sh \
-  -f "$cert_pem_file" \
-  -p "$cert_password" \
- --proxy "$proxy" \
-  --accept 'application/n-triples' \
-  "$target")
-
-# extract the numbers from the sequence properties
-sequence_number=$(echo "$ntriples" | grep "<${target}> <http://www.w3.org/1999/02/22-rdf-syntax-ns#_" | cut -d " " -f 2 | cut -d'#' -f 2 | cut -d '_' -f 2 | cut -d '>' -f 1 |  sort -nr | head -n1)
-sequence_number=$((sequence_number + 1)) # increase the counter
-sequence_property="http://www.w3.org/1999/02/22-rdf-syntax-ns#_${sequence_number}"
-
 args+=("-f")
 args+=("$cert_pem_file")
 args+=("-p")
@@ -127,7 +108,6 @@ fi
 turtle+="@prefix ldh:	<https://w3id.org/atomgraph/linkeddatahub#> .\n"
 turtle+="@prefix dct:	<http://purl.org/dc/terms/> .\n"
 turtle+="@prefix spin:  <http://spinrdf.org/spin#> .\n"
-turtle+="<${target}> <${sequence_property}> ${subject} .\n"
 turtle+="${subject} a ldh:View .\n"
 turtle+="${subject} spin:query <${query}> .\n"
 
diff --git a/src/main/resources/com/atomgraph/linkeddatahub/app/admin/adm.ttl b/src/main/resources/com/atomgraph/linkeddatahub/app/admin/adm.ttl
index 4c09fa8ce..7caea6f54 100644
--- a/src/main/resources/com/atomgraph/linkeddatahub/app/admin/adm.ttl
+++ b/src/main/resources/com/atomgraph/linkeddatahub/app/admin/adm.ttl
@@ -90,7 +90,7 @@ WHERE
       {   { ?class  a  owl:Class }
         UNION
           { ?class  a  rdfs:Class }
-        ?class  rdfs:isDefinedBy  $this
+        ?class  rdfs:isDefinedBy  $about
       }
   }
 """ .
@@ -234,7 +234,7 @@ PREFIX  acl:  <http://www.w3.org/ns/auth/acl#>
 SELECT DISTINCT  ?agent
 WHERE
   { GRAPH ?authGraph
-      { $this  acl:agent  ?agent }
+      { $about  acl:agent  ?agent }
   }
 """ ;
     rdfs:isDefinedBy : .
diff --git a/src/main/resources/com/atomgraph/linkeddatahub/ldh.ttl b/src/main/resources/com/atomgraph/linkeddatahub/ldh.ttl
index 322cf23da..fc9eec4a1 100644
--- a/src/main/resources/com/atomgraph/linkeddatahub/ldh.ttl
+++ b/src/main/resources/com/atomgraph/linkeddatahub/ldh.ttl
@@ -574,8 +574,11 @@ dh:Item spin:constructor :TitleConstructor, :DescriptionConstructor, :PrimaryTop
         PREFIX spin:    <http://spinrdf.org/spin#>
 
         CONSTRUCT {
-            $this rdf:_1 [ a ldh:View ;
-                spin:query ldh:SelectChildren
+            $this rdf:_1 [ a ldh:Object ;
+                rdf:value [
+                    a ldh:View ;
+                    spin:query ldh:SelectChildren
+                ]
             ] .
         }
         WHERE {}""" ;
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
index 7d436c4b4..01d3ae496 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block.xsl
@@ -117,6 +117,18 @@ exclude-result-prefixes="#all"
 
     <!-- render block -->
     
+    <!-- match resources that are not LDH system resources -->
+    <xsl:template match="*[@typeof[not(. = ('&ldh;Object', '&ldh;View', '&ldh;GraphChart', '&ldh;ResultSetChart'))]]" mode="ldh:RenderRow" priority="1">
+        <xsl:apply-templates mode="#current"/>
+        
+        <!-- hide the progress bar -->
+        <xsl:for-each select="ancestor::div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')]">
+            <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
+            <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
+            <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
+        </xsl:for-each>
+    </xsl:template>
+
     <xsl:template match="*" mode="ldh:RenderRow">
         <xsl:apply-templates mode="#current"/>
     </xsl:template>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl
index df2b1b9c5..c8ddd0aa6 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/chart.xsl
@@ -203,7 +203,7 @@ exclude-result-prefixes="#all"
     </xsl:template>
     
     <!-- render chart block -->
-    <xsl:template match="*[@about][@typeof = ('&ldh;ResultSetChart', '&ldh;GraphChart')][descendant::*[@property = '&spin;query'][@resource]][descendant::*[@property = '&ldh;chartType'][@resource]]" mode="ldh:RenderRow" priority="1">
+    <xsl:template match="*[@typeof = ('&ldh;ResultSetChart', '&ldh;GraphChart')][descendant::*[@property = '&spin;query'][@resource]][descendant::*[@property = '&ldh;chartType'][@resource]]" mode="ldh:RenderRow" priority="2"> <!-- prioritize above block.xsl -->
         <xsl:param name="block" select="ancestor-or-self::div[contains-token(@class, 'block')][1]" as="element()"/>
         <xsl:param name="about" select="$block/@about" as="xs:anyURI"/>
         <xsl:param name="container" select="." as="element()"/>
@@ -218,7 +218,7 @@ exclude-result-prefixes="#all"
         <xsl:param name="chart-type-id" select="'chart-type'" as="xs:string"/>
         <xsl:param name="category-id" select="'category'" as="xs:string"/>
         <xsl:param name="series-id" select="'series'" as="xs:string"/>
-        <xsl:param name="form-actions" as="element()">
+        <xsl:param name="form-actions" as="element()?">
             <div class="form-actions">
                 <button class="btn btn-primary btn-save-chart" type="button">
                     <xsl:apply-templates select="key('resources', 'save', document(resolve-uri('static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/translations.rdf', $ac:contextUri)))" mode="ldh:logo">
@@ -365,9 +365,10 @@ exclude-result-prefixes="#all"
                 </xsl:for-each>
             </xsl:for-each>
         </xsl:variable>
-        <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
-        <xsl:variable name="block-id" select="$block/@id" as="xs:string"/>
-        <xsl:variable name="block-uri" select="if ($block/@about) then $block/@about else xs:anyURI(ac:absolute-path(ldh:base-uri(.)) || '#' || $block-id)" as="xs:anyURI"/>
+        <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()?"/>
+        <xsl:variable name="block-id" select="$block/@id" as="xs:string?"/>
+        <!-- if there is no block, the chart is rendering the current document -->
+        <xsl:variable name="block-uri" select="if ($block/@about) then $block/@about else (if ($block-id) then xs:anyURI(ac:absolute-path(ldh:base-uri(.)) || '#' || $block-id) else ac:absolute-path(ldh:base-uri(.)))" as="xs:anyURI"/>
         <xsl:variable name="chart-canvas-id" select="ancestor::fieldset/following-sibling::div/@id" as="xs:string"/>
         <xsl:variable name="results" select="if (ixsl:contains(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'results')) then ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'results') else root(ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'content'))" as="document-node()"/>
         
@@ -400,9 +401,10 @@ exclude-result-prefixes="#all"
                 </xsl:for-each>
             </xsl:for-each>
         </xsl:variable>
-        <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
-        <xsl:variable name="block-id" select="$block/@id" as="xs:string"/>
-        <xsl:variable name="block-uri" select="if ($block/@about) then $block/@about else xs:anyURI(ac:absolute-path(ldh:base-uri(.)) || '#' || $block-id)" as="xs:anyURI"/>
+        <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()?"/>
+        <xsl:variable name="block-id" select="$block/@id" as="xs:string?"/>
+        <!-- if there is no block, the chart is rendering the current document -->
+        <xsl:variable name="block-uri" select="if ($block/@about) then $block/@about else (if ($block-id) then xs:anyURI(ac:absolute-path(ldh:base-uri(.)) || '#' || $block-id) else ac:absolute-path(ldh:base-uri(.)))" as="xs:anyURI"/>
         <xsl:variable name="chart-canvas-id" select="ancestor::fieldset/following-sibling::div/@id" as="xs:string"/>
         <xsl:variable name="results" select="if (ixsl:contains(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'results')) then ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'results') else root(ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'content'))" as="document-node()"/>
 
@@ -433,9 +435,10 @@ exclude-result-prefixes="#all"
                 <xsl:sequence select="ixsl:get(ixsl:call(ixsl:get($select, 'selectedOptions'), 'item', [ . ]), 'value')"/>
             </xsl:for-each>
         </xsl:variable>
-        <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()"/>
-        <xsl:variable name="block-id" select="$block/@id" as="xs:string"/>
-        <xsl:variable name="block-uri" select="if ($block/@about) then $block/@about else xs:anyURI(ac:absolute-path(ldh:base-uri(.)) || '#' || $block-id)" as="xs:anyURI"/>
+        <xsl:variable name="block" select="ancestor::div[contains-token(@class, 'block')][1]" as="element()?"/>
+        <xsl:variable name="block-id" select="$block/@id" as="xs:string?"/>
+        <!-- if there is no block, the chart is rendering the current document -->
+        <xsl:variable name="block-uri" select="if ($block/@about) then $block/@about else (if ($block-id) then xs:anyURI(ac:absolute-path(ldh:base-uri(.)) || '#' || $block-id) else ac:absolute-path(ldh:base-uri(.)))" as="xs:anyURI"/>
         <xsl:variable name="chart-canvas-id" select="ancestor::fieldset/following-sibling::div/@id" as="xs:string"/>
         <xsl:variable name="results" select="if (ixsl:contains(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'results')) then ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'results') else root(ixsl:get(ixsl:get(ixsl:get(ixsl:window(), 'LinkedDataHub.contents'), '`' || $block-uri || '`'), 'content'))" as="document-node()"/>
 
@@ -619,6 +622,7 @@ exclude-result-prefixes="#all"
                             <xsl:call-template name="onChartSPARQLResultsLoad">
                                 <xsl:with-param name="endpoint" select="$endpoint"/>
                                 <xsl:with-param name="results-uri" select="$results-uri"/>
+                                <xsl:with-param name="block" select="$block"/>
                                 <xsl:with-param name="container" select="$container"/>
                                 <xsl:with-param name="chart-canvas-id" select="$canvas-id"/>
                                 <xsl:with-param name="block-uri" select="$block/@about"/>
@@ -657,6 +661,7 @@ exclude-result-prefixes="#all"
     
     <xsl:template name="onChartSPARQLResultsLoad">
         <xsl:context-item as="map(*)" use="required"/>
+        <xsl:param name="block" as="element()"/>
         <xsl:param name="container" as="element()"/>
         <xsl:param name="results-uri" as="xs:anyURI"/>
         <xsl:param name="block-uri" select="$results-uri" as="xs:anyURI"/>
@@ -710,8 +715,15 @@ $series: <xsl:value-of select="$series"/>
                         <xsl:with-param name="series" select="$series"/>
                     </xsl:call-template>
 
-                    <xsl:for-each select="$container//div[@class = 'progress-bar']">
+<!--                    <xsl:for-each select="$container//div[@class = 'progress-bar']">
                         <ixsl:set-style name="display" select="'none'" object="."/>
+                    </xsl:for-each>-->
+                    
+                    <!-- hide the progress bar - either of this block (if it contains a progress bar) or of the parent block -->
+                    <xsl:for-each select="($block//div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')], $block/ancestor::div[contains-token(@class, 'block')]//div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')])[1]">
+                        <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
+                        <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
+                        <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
                     </xsl:for-each>
                 </xsl:for-each>
             </xsl:when>
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/object.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/object.xsl
index eb6851998..5b4e944d1 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/object.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/object.xsl
@@ -67,7 +67,7 @@ exclude-result-prefixes="#all"
 
         <xsl:for-each select="$block//div[contains-token(@class, 'bar')]">
             <!-- update progress bar -->
-            <ixsl:set-style name="width" select="'75%'" object="."/>
+            <ixsl:set-style name="width" select="'50%'" object="."/>
         </xsl:for-each>
         
         <!-- don't use ldh:base-uri(.) because its value comes from the last HTML document load -->
@@ -172,17 +172,15 @@ exclude-result-prefixes="#all"
                         <xsl:with-param name="mode" select="$mode"/>
                         <xsl:with-param name="show-edit-button" select="$show-edit-button" tunnel="yes"/>
                         <xsl:with-param name="object-metadata" select="$object-metadata" tunnel="yes"/>
+                        <xsl:with-param name="show-row-block-controls" select="false()"/> <!-- blocks nested within ldh:Object do not show their own progress bars -->
                     </xsl:apply-templates>
                 </xsl:variable>
 
-            <xsl:message>
-                ldh:LoadBlockObjectMetadata $resource: <xsl:value-of select="serialize($resource)"/>
-                ldh:LoadBlockObjectMetadata $row: <xsl:value-of select="serialize($row)"/>
-            </xsl:message>
+                <xsl:message>
+                    ldh:LoadBlockObjectMetadata $resource: <xsl:value-of select="serialize($resource)"/>
+                    ldh:LoadBlockObjectMetadata $row: <xsl:value-of select="serialize($row)"/>
+                </xsl:message>
         
-                <!-- hide the row with the block controls -->
-                <ixsl:set-style name="z-index" select="'-1'" object="key('elements-by-class', 'row-block-controls', $block)"/>
-                
                 <xsl:for-each select="$container">
                     <xsl:result-document href="?." method="ixsl:replace-content">
                         <!-- wrap the row -->
@@ -193,18 +191,21 @@ exclude-result-prefixes="#all"
                     
                     <xsl:apply-templates mode="ldh:RenderRow"/> <!-- recurse down the block hierarchy -->
                 </xsl:for-each>
+
+                <!-- hide the row with the block controls -->
+<!--                <ixsl:set-style name="z-index" select="'-1'" object="key('elements-by-class', 'row-block-controls', $block)"/>-->
                 
                 <!-- hide the progress bar -->
-                <xsl:for-each select="$block/div[contains-token(@class, 'span12')]">
+<!--                <xsl:for-each select="$block/div[contains-token(@class, 'span12')]">
                     <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
                     <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
                     <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
-                </xsl:for-each>
+                </xsl:for-each>-->
             </xsl:when>
             <xsl:otherwise>
                 <xsl:value-of select="ixsl:call(ixsl:window(), 'alert', [ ?message ])[current-date() lt xs:date('2000-01-01')]"/>
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
-    
+
 </xsl:stylesheet>
\ No newline at end of file
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl
index d827f4d8a..8ddaa83ef 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/query.xsl
@@ -233,6 +233,13 @@ exclude-result-prefixes="#all"
             </xsl:result-document>
         </xsl:for-each>
         
+        <!-- hide the progress bar - either of this block (if it contains a progress bar) or of the parent block -->
+        <xsl:for-each select="($block//div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')], $block/ancestor::div[contains-token(@class, 'block')]//div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')])[1]">
+            <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
+            <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
+            <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
+        </xsl:for-each>
+        
         <xsl:apply-templates mode="#current"/>
     </xsl:template>
     
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl
index 9d44ec2b0..0d1b04a64 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/block/view.xsl
@@ -73,19 +73,19 @@ exclude-result-prefixes="#all"
         
     <!-- render view -->
     
-    <xsl:template match="*[@typeof = '&ldh;View'][descendant::*[@property = '&spin;query'][@resource]]" mode="ldh:RenderRow" priority="1">
+    <xsl:template match="*[@typeof = '&ldh;View'][descendant::*[@property = '&spin;query'][@resource]]" mode="ldh:RenderRow" priority="2"> <!-- prioritize above block.xsl -->
         <xsl:param name="block" select="ancestor-or-self::div[contains-token(@class, 'block')][1]" as="element()"/>
-        <xsl:param name="about" select="$block/@about" as="xs:anyURI"/>
-        <xsl:param name="this" select="$block/ancestor::*[@about][1]/@about" as="xs:anyURI"/> <!-- outer @about context -->
+        <xsl:param name="this" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI"/> <!-- document URL -->
+        <xsl:param name="parent-about" select="$block/ancestor::*[@about][1]/@about" as="xs:anyURI"/> <!-- outer @about context -->
         <xsl:param name="container" select="." as="element()"/>
         <xsl:param name="graph" select="descendant::*[@property = '&ldh;graph']/@resource" as="xs:anyURI?"/>
         <xsl:param name="mode" select="descendant::*[@property = '&ac;mode']/@resource" as="xs:anyURI?"/>
         <xsl:param name="refresh-content" as="xs:boolean?"/>
-        <xsl:param name="base-uri" select="ldh:base-uri(.)" as="xs:anyURI"/>
         <xsl:param name="query-uri" select="descendant::*[@property = '&spin;query']/@resource" as="xs:anyURI"/>
         
-        <xsl:message>ldh:View ldh:RenderBlock $about: <xsl:value-of select="$about"/></xsl:message>
+<!--        <xsl:message>ldh:View ldh:RenderBlock $about: <xsl:value-of select="$about"/></xsl:message>-->
         <xsl:message>ldh:View $query-uri: <xsl:value-of select="$query-uri"/></xsl:message>
+        <xsl:message>ldh:View $parent-about: <xsl:value-of select="$parent-about"/></xsl:message>
 
         <xsl:for-each select="$block//div[contains-token(@class, 'bar')]">
             <!-- update progress bar -->
@@ -97,6 +97,7 @@ exclude-result-prefixes="#all"
             <ixsl:schedule-action http-request="map{ 'method': 'GET', 'href': $request-uri, 'headers': map{ 'Accept': 'application/rdf+xml' } }">
                 <xsl:call-template name="ldh:ViewQueryLoad">
                     <xsl:with-param name="this" select="$this"/>
+                    <xsl:with-param name="about" select="$parent-about"/> <!-- $about in the query gets set to the @about of the *parent* block -->
                     <xsl:with-param name="block" select="$block"/>
                     <xsl:with-param name="container" select="$container"/>
                     <xsl:with-param name="mode" select="$mode"/>
@@ -111,6 +112,7 @@ exclude-result-prefixes="#all"
     <xsl:template name="ldh:ViewQueryLoad">
         <xsl:context-item as="map(*)" use="required"/>
         <xsl:param name="this" as="xs:anyURI"/>
+        <xsl:param name="about" as="xs:anyURI"/>
         <xsl:param name="block" as="element()"/>
         <xsl:param name="container" as="element()"/>
         <xsl:param name="mode" as="xs:anyURI?"/>
@@ -127,6 +129,7 @@ exclude-result-prefixes="#all"
                     <xsl:variable name="service-uri" select="xs:anyURI($select-query/ldh:service/@rdf:resource)" as="xs:anyURI?"/>
                     <!-- set $this variable value unless getting the query string from state -->
                     <xsl:variable name="select-string" select="replace($select-query/sp:text, '$this', '&lt;' || $this || '&gt;', 'q')" as="xs:string"/>
+                    <xsl:variable name="select-string" select="replace($select-string, '$about', '&lt;' || $about || '&gt;', 'q')" as="xs:string"/>
                     <xsl:message>$select-string: <xsl:value-of select="$select-string"/></xsl:message>
                     <xsl:variable name="select-xml" as="document-node()">
                         <xsl:variable name="select-json" as="item()">
@@ -210,8 +213,6 @@ exclude-result-prefixes="#all"
                                     </div>
                                 </xsl:result-document>
                             </xsl:for-each>
-
-<!--                            <xsl:apply-templates select="$container" mode="ldh:BlockRendered"/>-->
                         </xsl:otherwise>
                     </xsl:choose>
                 </xsl:for-each>
@@ -712,8 +713,8 @@ exclude-result-prefixes="#all"
             </xsl:call-template>
         </xsl:if>
         
-        <!-- hide the progress bar -->
-        <xsl:for-each select="$block/div[contains-token(@class, 'span12')]">
+        <!-- hide the progress bar - either of this block (if it contains a progress bar) or of the parent block -->
+        <xsl:for-each select="($block//div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')], $block/ancestor::div[contains-token(@class, 'block')]//div[contains-token(@class, 'span12')][contains-token(@class, 'progress')][contains-token(@class, 'active')])[1]">
             <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress', false() ])[current-date() lt xs:date('2000-01-01')]"/>
             <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'progress-striped', false() ])[current-date() lt xs:date('2000-01-01')]"/>
             <xsl:sequence select="ixsl:call(ixsl:get(., 'classList'), 'toggle', [ 'active', false() ])[current-date() lt xs:date('2000-01-01')]"/>
@@ -1602,9 +1603,6 @@ exclude-result-prefixes="#all"
                             </xsl:result-document>
                         </xsl:for-each>
                         
-<!--                        <xsl:apply-templates select="$container" mode="ldh:BlockRendered"/>-->
-
-                        <!-- make sure the asynchronous templates below execute after ldh:BlockRendered -->
                         <xsl:for-each select="$bgp-triples-map">
                             <!-- only simple properties in the BGP are supported, not property paths etc. -->
                             <xsl:if test="json:string[@key = 'predicate']">
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl
index 1796a3527..f7eeab1f2 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/client/functions.xsl
@@ -37,7 +37,7 @@ exclude-result-prefixes="#all"
     <xsl:function name="ldh:base-uri" as="xs:anyURI">
         <xsl:param name="arg" as="node()"/> <!-- ignored -->
 
-        <xsl:sequence select="xs:anyURI(ixsl:get(ixsl:window(), 'location.href'))"/>
+        <xsl:sequence select="ac:document-uri(ixsl:get(ixsl:window(), 'location.href'))"/>
     </xsl:function>
     
     <xsl:function name="ldt:base" as="xs:anyURI">
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
index 4b930d8b3..2cb0c8c48 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/document.xsl
@@ -13,8 +13,8 @@
     <!ENTITY http   "http://www.w3.org/2011/http#">
     <!ENTITY sc     "http://www.w3.org/2011/http-statusCodes#">
     <!ENTITY acl    "http://www.w3.org/ns/auth/acl#">
-    <!ENTITY sd     "http://www.w3.org/ns/sparql-service-description#">
     <!ENTITY sh     "http://www.w3.org/ns/shacl#">
+    <!ENTITY sd     "http://www.w3.org/ns/sparql-service-description#">
     <!ENTITY ldt    "https://www.w3.org/ns/ldt#">
     <!ENTITY dh     "https://www.w3.org/ns/ldt/document-hierarchy#">
     <!ENTITY dct    "http://purl.org/dc/terms/">
@@ -306,7 +306,7 @@ extension-element-prefixes="ixsl"
         <xsl:param name="query" as="xs:string?"/>
         <xsl:param name="show-controls" select="true()" as="xs:boolean"/>
         <xsl:param name="show-save" select="true()" as="xs:boolean"/>
-        <xsl:param name="form-actions" as="element()">
+        <xsl:param name="form-actions" as="element()?">
             <xsl:if test="$show-save">
                 <div class="form-actions">
                     <button class="btn btn-primary btn-save-chart" type="button">
@@ -472,7 +472,7 @@ extension-element-prefixes="ixsl"
         <xsl:param name="query" as="xs:string?"/>
         <xsl:param name="show-controls" select="true()" as="xs:boolean"/>
         <xsl:param name="show-save" select="true()" as="xs:boolean"/>
-        <xsl:param name="form-actions" as="element()">
+        <xsl:param name="form-actions" as="element()?">
             <xsl:if test="$show-save">
                 <div class="form-actions">
                     <button class="btn btn-primary btn-save-chart" type="button">
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
index 0f6fd765a..26b18ca2f 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/layout.xsl
@@ -21,8 +21,8 @@
     <!ENTITY sc     "http://www.w3.org/2011/http-statusCodes#">
     <!ENTITY acl    "http://www.w3.org/ns/auth/acl#">
     <!ENTITY cert   "http://www.w3.org/ns/auth/cert#">
-    <!ENTITY sd     "http://www.w3.org/ns/sparql-service-description#">
     <!ENTITY sh     "http://www.w3.org/ns/shacl#">
+    <!ENTITY sd     "http://www.w3.org/ns/sparql-service-description#">
     <!ENTITY ldt    "https://www.w3.org/ns/ldt#">
     <!ENTITY c      "https://www.w3.org/ns/ldt/core/domain#">
     <!ENTITY ct     "https://www.w3.org/ns/ldt/core/templates#">
@@ -174,7 +174,7 @@ LIMIT   100
             SELECT  *
             WHERE
               {
-                $Type  ldh:template  ?content
+                $Type  ldh:template  ?block
               }
         ]]>
         <!-- VALUES $Type goes here -->
diff --git a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
index 0099f5dc7..1ab3ea7c8 100644
--- a/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
+++ b/src/main/webapp/static/com/atomgraph/linkeddatahub/xsl/bootstrap/2.3.2/resource.xsl
@@ -18,8 +18,8 @@
     <!ENTITY acl    "http://www.w3.org/ns/auth/acl#">
     <!ENTITY ldt    "https://www.w3.org/ns/ldt#">
     <!ENTITY dh     "https://www.w3.org/ns/ldt/document-hierarchy#">
-    <!ENTITY sd     "http://www.w3.org/ns/sparql-service-description#">
     <!ENTITY sh     "http://www.w3.org/ns/shacl#">
+    <!ENTITY sd     "http://www.w3.org/ns/sparql-service-description#">
     <!ENTITY dct    "http://purl.org/dc/terms/">
     <!ENTITY foaf   "http://xmlns.com/foaf/0.1/">
     <!ENTITY sioc   "http://rdfs.org/sioc/ns#">
@@ -460,21 +460,16 @@ extension-element-prefixes="ixsl"
     </xsl:template>
     
     <!-- BLOCK -->
-
-    <xsl:template match="*[@rdf:about][rdf:type/@rdf:resource = ('&sp;Describe', '&sp;Construct', '&sp;Ask', '&sp;Select')]" mode="bs2:Row" priority="1">
-        <xsl:next-match>
-            <xsl:with-param name="class" select="'row-fluid block'"/>
-        </xsl:next-match>
-    </xsl:template>
         
     <!-- resource block overrides -->
-    <xsl:template match="*[@rdf:about][rdf:type/@rdf:resource = '&ldh;Object']" mode="bs2:Row" priority="1">
+    <xsl:template match="*[@rdf:about][rdf:type/@rdf:resource = ('&ldh;Object', '&ldh;View', '&ldh;GraphChart', '&ldh;ResultSetChart', '&sp;Describe', '&sp;Construct', '&sp;Ask', '&sp;Select')]" mode="bs2:Row" priority="1">
         <!-- TO-DO: use $ldh:requestUri to resolve URIs server-side -->
         <xsl:param name="id" select="if (contains(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#')) then substring-after(@rdf:about, ac:absolute-path(ldh:base-uri(.)) || '#') else generate-id()" as="xs:string?"/>
         <xsl:param name="class" select="'row-fluid block'" as="xs:string?"/>
         <xsl:param name="about" select="@rdf:about" as="xs:anyURI?"/>
         <xsl:param name="typeof" select="rdf:type/@rdf:resource/xs:anyURI(.)" as="xs:anyURI*"/>
         <xsl:param name="draggable" select="$acl:mode = '&acl;Write'" as="xs:boolean?"/>
+        <xsl:param name="show-row-block-controls" select="true()" as="xs:boolean"/>
 
         <xsl:apply-templates select="key('resources', .)" mode="bs2:RowContentHeader"/>
 
@@ -498,24 +493,29 @@ extension-element-prefixes="ixsl"
                 <xsl:attribute name="draggable" select="'false'"/>
             </xsl:if>
 
-            <div class="span12 progress progress-striped active">
-                <div class="row-fluid row-block-controls" style="position: relative; top: 30px; margin-top: -30px; z-index: 1;">
-                    <div class="span12">
-                        <xsl:if test="$acl:mode = '&acl;Write'">
-                            <button type="button" class="btn btn-edit pull-right" style="display: none;">
-                                <xsl:apply-templates select="key('resources', '&ac;EditMode', document(ac:document-uri('&ac;')))" mode="ac:label"/>
-                            </button>
-                        </xsl:if>
-                        <div class="row-fluid">
-                            <div style="width: 50%;" class="span12 bar"></div>
+            <div class="span12">
+                <xsl:if test="$show-row-block-controls">
+                    <xsl:attribute name="class" select="'span12 progress progress-striped active'"/>
+                    
+                    <div class="row-fluid row-block-controls" style="position: relative; top: 30px; margin-top: -30px; z-index: 1;">
+                        <div class="span12">
+                            <xsl:if test="$acl:mode = '&acl;Write'">
+                                <button type="button" class="btn btn-edit pull-right" style="display: none;">
+                                    <xsl:apply-templates select="key('resources', '&ac;EditMode', document(ac:document-uri('&ac;')))" mode="ac:label"/>
+                                </button>
+                            </xsl:if>
+                            <div class="row-fluid">
+                                <div style="width: 25%;" class="span12 bar"></div>
+                            </div>
                         </div>
                     </div>
-                </div>
+                </xsl:if>
 
                 <!-- client-side $container -->
                 <xsl:next-match>
-                    <xsl:with-param name="id" select="()"/> <!-- only top-level blocks have @id-->
-                    <xsl:with-param name="about" select="()"/> <!-- only top-level blocks have @about -->
+                    <xsl:with-param name="id" select="()"/> <!-- only block <div>s have @id-->
+                    <xsl:with-param name="about" select="()"/> <!-- only block <div>s have @about -->
+                    <xsl:with-param name="class" select="'row-fluid'"/>
                 </xsl:next-match>
             </div>
         </div>
@@ -619,7 +619,26 @@ extension-element-prefixes="ixsl"
 
         <xsl:choose>
             <xsl:when test="exists($block-values)">
-                <div class="row-fluid">
+                <div>
+                    <xsl:if test="$id">
+                        <xsl:attribute name="id" select="$id"/>
+                    </xsl:if>
+                    <xsl:if test="$class">
+                        <xsl:attribute name="class" select="$class"/>
+                    </xsl:if>
+                    <xsl:if test="$about">
+                        <xsl:attribute name="about" select="$about"/>
+                    </xsl:if>
+        <!--            <xsl:if test="exists($typeof)">
+                        <xsl:attribute name="typeof" select="string-join($typeof, ' ')"/>
+                    </xsl:if>-->
+<!--                    <xsl:if test="$draggable = true()">
+                        <xsl:attribute name="draggable" select="'true'"/>
+                    </xsl:if>
+                    <xsl:if test="$draggable = false()">
+                        <xsl:attribute name="draggable" select="'false'"/>
+                    </xsl:if>-->
+            
                     <div class="span12">
                         <xsl:next-match>
                             <xsl:with-param name="id" select="()"/> <!-- unset @id -->
@@ -630,11 +649,14 @@ extension-element-prefixes="ixsl"
                             <xsl:with-param name="style" select="$style"/>
                         </xsl:next-match>
 
+                        <xsl:variable name="base-uri" select="ac:absolute-path(ldh:base-uri(.))" as="xs:anyURI"/>
                         <!-- render contents attached to the types of this resource using ldh:template -->
                         <xsl:for-each select="$block-values" use-when="system-property('xsl:product-name') = 'SAXON'">
                             <xsl:if test="doc-available(ac:document-uri(.))">
+                                <xsl:variable name="id" select="'#id' || ac:uuid()" as="xs:string"/>
                                 <xsl:apply-templates select="key('resources', ., document(ac:document-uri(.)))" mode="bs2:Row">
-                                    <xsl:with-param name="about" select="()"/> <!-- unset the @about -->
+                                    <xsl:with-param name="about" select="xs:anyURI($base-uri || $id)"/> <!-- set a unique @about -->
+                                    <xsl:with-param name="id" select="$id"/>
                                 </xsl:apply-templates>
                             </xsl:if>
                         </xsl:for-each>