diff --git a/tools/clog-builder-settings.lisp b/tools/clog-builder-settings.lisp
index ad13336..9180380 100644
--- a/tools/clog-builder-settings.lisp
+++ b/tools/clog-builder-settings.lisp
@@ -763,7 +763,8 @@
 		      (:name "encoding"
 		       :prop "encoding")
 		      (:name "form element count"
-		       :get ,(lambda (control) (form-element-count control)))))
+		       :get ,(lambda (control) (form-element-count control)))
+		      ,@*props-element*))
    `(:name           "input"
      :description    "Form Input"
      :clog-type      clog:clog-form-element
diff --git a/tools/clog-builder.lisp b/tools/clog-builder.lisp
index 1e2d357..a4bc825 100644
--- a/tools/clog-builder.lisp
+++ b/tools/clog-builder.lisp
@@ -816,7 +816,7 @@ of controls and double click to select control."
 \(defun create-~A \(clog-obj &key \(hidden nil\) \(class nil\) \(html-id nil\) \(auto-place t\)\)
   \(let \(\(panel \(change-class \(clog:create-div clog-obj :content \"~A\"
          :hidden hidden :class class :html-id html-id :auto-place auto-place\) \'~A\)\)\)
-~{~A~}~{~A~}    panel\)\)"
+~{~A~}~{~A~}    panel\)\)~%"
 			  (string-upcase package)
 			  cname     ;;defclass
 			  cmembers
@@ -1333,6 +1333,7 @@ of controls and double click to select control."
 				    (declare (ignore obj))()))))
 
 (defun on-new-app-template (obj)
+  "Menu option to create new project from template"
   (let* ((app (connection-data-item obj "builder-app-data"))
 	 (win (create-gui-window obj :title "New Application Template"
 				     :width 500 :height 400))
diff --git a/tools/clog-templates.clog b/tools/clog-templates.clog
index ba42718..29451bf 100644
--- a/tools/clog-templates.clog
+++ b/tools/clog-templates.clog
@@ -1 +1 @@
-<data id="I3852934955" data-in-package="clog-tools" data-custom-slots="(win :accessor win)" data-clog-next-id="10" data-clog-title="clog-templates"></data><label for="" data-clog-type="label" data-clog-name="none-label-2" style="box-sizing: content-box; position: absolute; left: 7px; top: 6px; text-align: start; cursor: default; font: bold 15px / 22.5px Verdana, sans-serif&nbsp;; bottom: 211.5px;">Available Templates:</label><div data-clog-type="div" data-clog-name="none-div-1" style="box-sizing: content-box; position: absolute; inset: 35px 7px 45px;"><select data-clog-type="listbox" size="4" data-clog-name="template-box" style="box-sizing: content-box; position: static; inset: 40px 5px 5px; width: 100%; height: 100%;"></select></div><button data-clog-type="button" data-clog-name="fill-button" class="" style="box-sizing: content-box; position: absolute; left: 7px; bottom: 5px;" data-on-click="(fill-button-clicked panel)">Fill Template</button>
\ No newline at end of file
+<data id="I3853160687" data-in-package="clog-tools" data-custom-slots="(win :accessor win)" data-clog-next-id="11" data-clog-title="clog-templates"></data><form action="#" onsubmit="return false;" target="_self" data-clog-type="form" data-clog-name="none-form" style="box-sizing: content-box; position: static; left: 162px; top: 216px;"><label for="" data-clog-type="label" data-clog-name="none-label-2" style="box-sizing: content-box; position: absolute; left: 7px; top: 6px; text-align: start; cursor: default; font: bold 15px / 22.5px Verdana, sans-serif&nbsp;; bottom: 211.5px;">Available Templates:</label><div data-clog-type="div" data-clog-name="none-div-1" style="box-sizing: content-box; position: absolute; inset: 35px 7px 45px;"><select data-clog-type="listbox" size="4" data-clog-name="template-box" style="box-sizing: content-box; position: static; inset: 40px 5px 5px; width: 100%; height: 100%;"></select></div><button data-clog-type="button" data-clog-name="fill-button" class="" style="box-sizing: content-box; position: absolute; left: 7px; bottom: 5px;" data-on-click="(fill-button-clicked panel)">Fill Template</button></form>
\ No newline at end of file
diff --git a/tools/clog-templates.lisp b/tools/clog-templates.lisp
index 23649e2..1126521 100644
--- a/tools/clog-templates.lisp
+++ b/tools/clog-templates.lisp
@@ -4,9 +4,9 @@
     (template-box :reader template-box)
 (win :accessor win)))
 (defun create-clog-templates (clog-obj &key (hidden nil) (class nil) (html-id nil) (auto-place t))
-  (let ((panel (change-class (clog:create-div clog-obj :content "<label for=\"\" style=\"box-sizing: content-box; position: absolute; left: 7px; top: 6px; text-align: start; cursor: default; font: bold 15px / 22.5px Verdana, sans-serif&nbsp;; bottom: 211.5px;\" id=\"CLOGB3852939541\">Available Templates:</label><div style=\"box-sizing: content-box; position: absolute; inset: 35px 7px 45px;\" id=\"CLOGB3852939542\"><select size=\"4\" style=\"box-sizing: content-box; position: static; inset: 40px 5px 5px; width: 100%; height: 100%;\" id=\"CLOGB3852939543\"></select></div><button class=\"\" style=\"box-sizing: content-box; position: absolute; left: 7px; bottom: 5px;\" id=\"CLOGB3852939544\">Fill Template</button>"
+  (let ((panel (change-class (clog:create-div clog-obj :content "<form action=\"#\" onsubmit=\"return false;\" target=\"_self\" style=\"box-sizing: content-box; position: static; left: 162px; top: 216px;\" id=\"CLOGB3853161210\"><label for=\"\" style=\"box-sizing: content-box; position: absolute; left: 7px; top: 6px; text-align: start; cursor: default; font: bold 15px / 22.5px Verdana, sans-serif&nbsp;; bottom: 211.5px;\" id=\"CLOGB3853161211\">Available Templates:</label><div style=\"box-sizing: content-box; position: absolute; inset: 35px 7px 45px;\" id=\"CLOGB3853161212\"><select size=\"4\" style=\"box-sizing: content-box; position: static; inset: 40px 5px 5px; width: 100%; height: 100%;\" id=\"CLOGB3853161213\"></select></div><button class=\"\" style=\"box-sizing: content-box; position: absolute; left: 7px; bottom: 5px;\" id=\"CLOGB3853161214\">Fill Template</button></form>"
          :hidden hidden :class class :html-id html-id :auto-place auto-place) 'clog-templates)))
-    (setf (slot-value panel 'fill-button) (attach-as-child clog-obj "CLOGB3852939544" :clog-type 'CLOG:CLOG-BUTTON :new-id t))
-    (setf (slot-value panel 'template-box) (attach-as-child clog-obj "CLOGB3852939543" :clog-type 'CLOG:CLOG-SELECT :new-id t))
+    (setf (slot-value panel 'fill-button) (attach-as-child clog-obj "CLOGB3853161214" :clog-type 'CLOG:CLOG-BUTTON :new-id t))
+    (setf (slot-value panel 'template-box) (attach-as-child clog-obj "CLOGB3853161213" :clog-type 'CLOG:CLOG-SELECT :new-id t))
     (set-on-click (fill-button panel) (lambda (target) (declare (ignorable target)) (fill-button-clicked panel)))
-    panel))
\ No newline at end of file
+    panel))