<html>
  <head>
    <meta content="text/html; charset=ISO-8859-1"
      http-equiv="Content-Type">
  </head>
  <body bgcolor="#FFFFFF" text="#000000">
    Due to mail size limit, re-send this mail with content without
    comment deleted.<br>
    <pre wrap="">
diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl
index e8dac43..5b99e20 100644
--- a/ui/pages/storagepool-add.html.tmpl
+++ b/ui/pages/storagepool-add.html.tmpl
@@ -27,7 +27,7 @@
 &lt;!DOCTYPE html&gt;
 &lt;html&gt;
 &lt;body&gt;
-    &lt;div class="window" style="width: 600px; height: 700px;"&gt;
+    &lt;div class="window storage-window"&gt;
         &lt;header&gt;
             &lt;h1 class="title"&gt;$_("Define a New Storage Pool")&lt;/h1&gt;
             &lt;div class="close"&gt;X&lt;/div&gt;
@@ -40,18 +40,17 @@
                         &lt;p class="text-help"&gt;
                             $_("The name used to identify the storage pools, and it should not be empty.")
                         &lt;/p&gt;
-                        &lt;input id="poolId" required="required" type="text" class="text" style="width: 300px"
-                            name="name"&gt;
+                        &lt;input id="poolId" required="required" type="text" class="text storage-base-input-width" name="name"&gt;
                     &lt;/div&gt;
                 &lt;/section&gt;
                 &lt;section class="form-section"&gt;
                     &lt;h2&gt;2. $_("Storage Pool Type")&lt;/h2&gt;
                     &lt;div class="storage-type-wrapper-controls"&gt;
-                        &lt;div class="btn dropdown popable"&gt;
-                            &lt;input id="poolType" name="type" type="hidden" value="dir"/&gt;
-                            &lt;span class="text" id="pool-type-label"&gt;&lt;/span&gt;&lt;span class="arrow"&gt;&lt;/span&gt;
-                            &lt;div class="popover" style="width: 100%"&gt;
-                                &lt;ul class="select-list" id="storagePool-list" data-target="poolType" data-label="pool-type-label"&gt;
+                        &lt;div id="poolTypeId"&gt;
+                            &lt;input id="poolTypeInputId" name="type" type="hidden" value="dir"/&gt;
+                            &lt;span id="pool-type-label"&gt;&lt;/span&gt;&lt;span class="arrow"&gt;&lt;/span&gt;
+                            &lt;div&gt;
+                                &lt;ul id="storagePool-list"&gt;
                                 &lt;/ul&gt;
                             &lt;/div&gt;
                         &lt;/div&gt;
@@ -65,30 +64,40 @@
                                 $_("The path of the Storage Pool. Each Storage Pool must have a unique path.")&lt;/p&gt;
                             &lt;p class="text-help"&gt;
                                 $_("Kimchi will try to create the directory when it does not already exist in your system.")&lt;/p&gt;
-                            &lt;input id="pathId" type="text" class="text" required="required" style="width: 300px"&gt;
+                            &lt;input id="pathId" type="text" class="text" required="required storage-base-input-width"&gt;</pre>
    seems like something wrong &lt;input id="pathId" type="text"
    class="text" required="required <font color="#ff0000">storage-base-input-width</font>"&gt;
    <blockquote
      cite="mid:1389678404-15990-1-git-send-email-zhoumein@linux.vnet.ibm.com"
      type="cite">
      <pre wrap="">
                         &lt;/div&gt;
                         &lt;div class="clear"&gt;&lt;/div&gt;
                     &lt;/section&gt;
                 &lt;/div&gt;
                 &lt;div class="nfs-section tmpl-html"&gt;
                     &lt;section class="form-section"&gt;
-                        &lt;h2&gt;3. $_("NFS server IP")&lt;/h2&gt;
-                        &lt;div class="field"&gt;
+                        &lt;h2&gt;3. $_("NFS Server IP")&lt;/h2&gt;
+                        &lt;div class="field storage-field"&gt;
                             &lt;p class="text-help"&gt;
-                                $_("NFS server IP or hostname. It should not be empty.")&lt;/p&gt;
-                            &lt;input id="nfsserverId" required="required" type="text" class="text"
-                                style="width: 300px"&gt;
+                                $_("NFS server IP or hostname. It can be input or choose from history.")&lt;/p&gt;</pre>
    </blockquote>
    for this message, I suggest to make it to be "Add a new NFS server
    or select an existing one already in use." Would like to know
    backend guys opinion.<br>
    even use the original one, correct it to be "NFS server IP or
    hostname. It can be input or <font color="#ff0000">chosen</font>
    from history."
    <blockquote
      cite="mid:1389678404-15990-1-git-send-email-zhoumein@linux.vnet.ibm.com"
      type="cite">
      <pre wrap="">
+                            &lt;div id="serverComboboxId" class="storage-add-input-width"&gt;
+                                &lt;input id="nfsserverId"/&gt;
+                                &lt;span class="arrow"&gt;&lt;/span&gt;
+                                &lt;div&gt;
+                                    &lt;ul id="nfs-server-used"&gt;
+                                    &lt;/ul&gt;
+                                &lt;/div&gt;
+                            &lt;/div&gt;
                         &lt;/div&gt;
                     &lt;/section&gt;
                     &lt;section class="form-section"&gt;
                         &lt;h2&gt;4. $_("NFS Path")&lt;/h2&gt;
-                        &lt;div class="field"&gt;
+                        &lt;div class="field storage-field"&gt;
                             &lt;p class="text-help"&gt;$_("The nfs exported path on nfs server")&lt;/p&gt;
-                            &lt;input id="nfspathId" required="required" type="text" class="text"
-                                style="width: 300px"&gt;
-                            &lt;input type="hidden" id="localpathId" class="text" value="none"&gt;
-                        &lt;/div&gt;
-                        &lt;div class="clear"&gt;&lt;/div&gt;
+                            &lt;div id="targetFilterSelectId" class="storage-add-input-width"&gt;
+                                    &lt;input id="nfspathId" class="input" disabled/&gt;
+                                    &lt;span class="arrow"&gt;&lt;/span&gt;
+                                        &lt;div&gt;
+                                            &lt;ul id="nfs-server-target"&gt;
+                                            &lt;/ul&gt;
+                                        &lt;/div&gt;
+                                    &lt;/div&gt;
+                            &lt;/div&gt;
                     &lt;/section&gt;
                 &lt;/div&gt;
                 &lt;div class="logical-section tmpl-html"&gt;
@@ -103,15 +112,15 @@
                         &lt;div class="field"&gt;
                             &lt;p class="text-help"&gt;
                                 $_("iSCSI server IP or hostname. It should not be empty.")&lt;/p&gt;
-                            &lt;input id="iscsiserverId" placeholder="$_("Server")" type="text" class="text" style="width: 300px"&gt;
-                            &lt;input id="iscsiportId" placeholder="$_("Port")" type="text" class="text" style="width:40px" maxlength='4'&gt;
+                            &lt;input id="iscsiserverId" placeholder="$_("Server")" type="text storage-base-input-width" class="text"&gt;</pre>
    </blockquote>
    something wrong in &lt;input id="iscsiserverId"
    placeholder="$_("Server")" type="text <font color="#ff0000">storage-base-input-width</font>"
    class="text"&gt;
    <blockquote
      cite="mid:1389678404-15990-1-git-send-email-zhoumein@linux.vnet.ibm.com"
      type="cite">
      <pre wrap="">
+                            &lt;input id="iscsiportId" placeholder="$_("Port")" type="text" class="text storage-port-width" maxlength="4"&gt;
                         &lt;/div&gt;
                     &lt;/section&gt;
                     &lt;section class="form-section"&gt;
                         &lt;h2&gt;4. $_("Target")&lt;/h2&gt;
                         &lt;div class="field"&gt;
                             &lt;p class="text-help"&gt;$_("The iSCSI target on iSCSI server")&lt;/p&gt;
-                            &lt;input id="iscsiTargetId" type="text" class="text" style="width: 300px"&gt;
+                            &lt;input id="iscsiTargetId" type="text" class="text storage-base-input-width&gt;
                         &lt;/div&gt;
                     &lt;/section&gt;
                     &lt;section class="form-section"&gt;
@@ -123,8 +132,8 @@
                     &lt;section class="authenticationfield form-section tmpl-html"&gt;
                         &lt;h2&gt;5. $_("iSCSI Authentication")&lt;/h2&gt;
                         &lt;div class="field"&gt;
-                            &lt;input id="usernameId" placeholder="$_("User Name")" type="text" class="text" style="width: 150px"&gt;
-                            &lt;input id="passwordId" placeholder="$_("Password")" type="text" class="text" style="width: 150px"&gt;
+                            &lt;input id="usernameId" placeholder="$_("User Name")" type="text" class="text storage-auth-width"&gt;
+                            &lt;input id="passwordId" placeholder="$_("Password")" type="text" class="text storage-auth-width"&gt;
                         &lt;/div&gt;
                     &lt;/section&gt;
                 &lt;/div&gt;
</pre>
    </blockquote>
    <br>
  </body>
</html>