diff --git a/exampleSite/content/app/person.md b/exampleSite/content/app/person.md
index b0c2c4e..0f4d901 100644
--- a/exampleSite/content/app/person.md
+++ b/exampleSite/content/app/person.md
@@ -5,7 +5,7 @@ img:
 pageid: app_form_person
 domains: [App]
 topics: [Examples]
-date:   2023-03-27
+date:   2023-04-09
 draft:  false
 weight: 100
 ---
@@ -22,7 +22,6 @@ cyberscopes example site - view / edit person (user) data.
 
   {{< pv/data-buttons include="view" >}}
 
-<br>
   {{< pv/data-display
         expr="`${data.firstname} ${data.lastname}`.trim() || '???'" >}}
   {{< pv/data-display expr="state.id ? ` (Id: ${state.id})` : ''" >}} 
diff --git a/layouts/partials/button.html b/layouts/partials/pv/button.html
similarity index 65%
rename from layouts/partials/button.html
rename to layouts/partials/pv/button.html
index f55ce34..e073208 100644
--- a/layouts/partials/button.html
+++ b/layouts/partials/pv/button.html
@@ -1,3 +1,3 @@
 <button type="{{ .type }}" name="{{ .name }}" 
-		{{- with .mode }}v-show="hasmode('{{ . }}')"{{ end -}}
+		{{- with .mode }} v-show="hasmode('{{ . }}')" {{ end -}}
 	    @click="{{ .exec }}('{{ .action }}')">{{.label}}</button>
diff --git a/layouts/shortcodes/pv/button.html b/layouts/shortcodes/pv/button.html
index ea0aeff..4e7246d 100644
--- a/layouts/shortcodes/pv/button.html
+++ b/layouts/shortcodes/pv/button.html
@@ -7,4 +7,4 @@
 
 {{- $params := dict "type" $type "name" $name "label" $label
 		"exec" $exec "action" $action "mode" $mode -}}
-{{ partial "button" $params }}
+{{ partial "pv/button" $params }}
diff --git a/layouts/shortcodes/pv/data-buttons.html b/layouts/shortcodes/pv/data-buttons.html
index 688cfb8..ac37778 100644
--- a/layouts/shortcodes/pv/data-buttons.html
+++ b/layouts/shortcodes/pv/data-buttons.html
@@ -1,26 +1,27 @@
 {{- $defparams := dict "type" "button" "name" "submit" 
 	"exec" "exec" "action" "" "label" "Submit" -}}
 
-{{- $params := merge $defparams (
+<div>
+{{ $params := merge $defparams (
 	dict "mode" "view" "exec" "chmode" "action" "edit" "label" "Edit") -}}
-{{ partial "button" $params }}
+{{ partial "pv/button" $params }}
 
 {{- $params = merge $params (dict "action" "new" "label" "New") -}}
-{{ partial "button" $params }}
+{{ partial "pv/button" $params }}
 
 {{- $params = merge $params (
 	dict "mode" "edit new" "action" "view" "label" "Cancel") -}}
-{{ partial "button" $params }}
+{{ partial "pv/button" $params }}
 
 {{- $params = merge $defparams ( dict "mode" "edit" "label" "Save Changes") -}}
-{{ partial "button" $params }}
+{{ partial "pv/button" $params }}
 
 {{- $params = merge $params (dict "exec" "copynew" "label" "Copy Data") -}}
-{{ partial "button" $params }}
+{{ partial "pv/button" $params }}
 
 {{- $params = merge $params (dict "exec" "delete" "label" "Delete Item") -}}
-{{ partial "button" $params }}
+{{ partial "pv/button" $params }}
 
 {{- $params = merge $defparams ( dict "mode" "new" "label" "Create Item") -}}
-{{ partial "button" $params }}
-
+{{ partial "pv/button" $params }}
+</div>