diff --git a/tools/clog-builder.lisp b/tools/clog-builder.lisp
index ffc38b4..cad7215 100644
--- a/tools/clog-builder.lisp
+++ b/tools/clog-builder.lisp
@@ -243,10 +243,15 @@
 						      (setf (top parent) (text obj))))
 		     ("Left"   ,(left parent) t ,(lambda (obj)
 						       (setf (left parent) (text obj))))
-		     ("Value"  ,(value control) t ,(lambda (obj)
-						     (setf (value control) (text obj))))
-		     ("Text"   ,(text control) t ,(lambda (obj)
-						    (setf (text control) (text obj)))))))
+		     ("Width"   ,(width parent) t ,(lambda (obj)
+						     (setf (width parent) (text obj))))
+		     ("Height"   ,(height parent) t ,(lambda (obj)
+						       (setf (height parent) (text obj))))
+		     ,(if (typep control 'clog:clog-form-element)
+			  `("Value"  ,(value control) t ,(lambda (obj)
+							   (setf (value control) (text obj))))
+			  `("Text"   ,(text control) t ,(lambda (obj)
+							  (setf (text control) (text obj))))))))
 	(dolist (item props)	  
 	  (let* ((tr (create-table-row table))
 		 (td1 (create-table-column tr :content (first item)))
@@ -341,21 +346,23 @@
 			   (setf (current-control app) element)
 			   (setf (box-sizing element) :content-box)
 			   (setf (box-sizing handle) :content-box)
-			   (set-padding handle "0px" "16px" "0px" "0px")							
+			   (set-padding handle "0px" "16px" "0px" "0px")			   
+			   (set-on-mouse-up element (lambda (obj data)
+						      (setf (current-control app) element)
+						      (on-populate-control-properties win)))
 			   (set-on-focus-in element (lambda (obj)
 			   			      (declare (ignore obj))
-						      (setf (current-control app) element)
-						      (on-populate-control-properties win)
-						      (let ((x (position-left handle))
-							    (y (position-top handle)))
-							(set-geometry handle :left (- x 12) :top (- y 12))
-							(set-border handle "12px" :solid :blue))))
+			   			      (setf (current-control app) element)
+			   			      (let ((x (position-left handle))
+			   				    (y (position-top handle)))
+			   				(set-geometry handle :left (- x 12) :top (- y 12))
+			   				(set-border handle "12px" :solid :blue))))
 			   (set-on-focus-out element (lambda (obj)
 			   			       (declare (ignore obj))
-						       (let ((x (position-left handle))
-							     (y (position-top handle)))
-							 (set-border handle "initial" "" "")
-							 (set-geometry handle :left (+ x 12) :top (+ y 12)))))
+			   			       (let ((x (position-left handle))
+			   				     (y (position-top handle)))
+			   				 (set-border handle "initial" "" "")
+			   				 (set-geometry handle :left (+ x 12) :top (+ y 12)))))
 			   (setf (selected-tool app) nil)
 			   (clog::jquery-execute handle "draggable().resizable()")
 			   (set-geometry element :units "%" :width 100 :height 100)