diff --git a/ui/index.jsp b/ui/index.jsp
index 8b58d060d95..2323186b4cf 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -55,22 +55,18 @@ under the License.
               <label for="username"><fmt:message key="label.username"/></label>
               <input type="text" name="username" class="required" />
             </div>
-
             <!-- Password -->
             <div class="field password">
               <label for="password"><fmt:message key="label.password"/></label>
               <input type="password" name="password" class="required" />
             </div>
-
             <!-- Domain -->
             <div class="field domain">
               <label for="domain"><fmt:message key="label.domain"/></label>
               <input type="text" name="domain" />
             </div>
-
             <!-- Submit (login) -->
             <input type="submit" value="<fmt:message key="label.login"/>" />
-
             <!-- Select language -->
             <div class="select-language">
               <select name="language">
@@ -83,7 +79,6 @@ under the License.
           </div>
         </form>
       </div>
-
       <!-- Instance wizard -->
       <div class="multi-wizard instance-wizard">
         <div class="progress">
@@ -112,7 +107,6 @@ under the License.
                     </select>
                   </div>
                 </div>
-
                 <!-- Select template -->
                 <div class="section select-template">
                   <h3><fmt:message key="label.select.iso.or.template" /></h3>
@@ -302,7 +296,6 @@ under the License.
                   </div>
                 </div>
               </div>
-
               <!-- Step 5c: Select security group -->
               <div class="wizard-step-conditional select-security-group">
                 <div class="main-desc">
@@ -314,7 +307,6 @@ under the License.
                 </div>
               </div>
             </div>
-
             <!-- Step 6: Review -->
             <div class="step review" wizard-step-id="review">
               <div class="main-desc">
@@ -331,7 +323,6 @@ under the License.
                       <input type="text" name="displayname" />
                     </div>
                   </div>
-
                   <!-- Add to group -->
                   <div class="select odd">
                     <div class="name">
@@ -341,7 +332,6 @@ under the License.
                       <input type="text" name="groupname" />
                     </div>
                   </div>
-
                   <!-- Zone -->
                   <div class="select">
                     <div class="name">
@@ -354,7 +344,6 @@ under the License.
                       <a href="1"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
-
                   <!-- Hypervisor -->
                   <div class="select odd">
                     <div class="name">
@@ -367,7 +356,6 @@ under the License.
                       <a href="2"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
-
                   <!-- Template -->
                   <div class="select">
                     <div class="name">
@@ -380,7 +368,6 @@ under the License.
                       <a href="2"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
-
                   <!-- Service offering -->
                   <div class="select odd">
                     <div class="name">
@@ -393,7 +380,6 @@ under the License.
                       <a href="3"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
-
                   <!-- Data disk offering -->
                   <div class="select">
                     <div class="name">
@@ -406,7 +392,6 @@ under the License.
                       <a href="4"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
-
                   <!-- Primary network -->
                   <div class="select odd">
                     <div class="name">
@@ -437,7 +422,6 @@ under the License.
             </div>
           </div>
         </form>
-
         <!-- Computer diagram -->
         <div class="diagram">
           <div>
@@ -450,7 +434,6 @@ under the License.
           <div class="part hd"></div>
           <div class="part network-card"></div>
         </div>
-
         <!-- Buttons -->
         <div class="buttons">
           <div class="button previous"><span><fmt:message key="label.previous"/></span></div>
@@ -458,7 +441,6 @@ under the License.
           <div class="button next"><span><fmt:message key="label.next"/></span></div>
         </div>
       </div>
-
       <!-- Zone wizard -->
       <div class="multi-wizard zone-wizard">
         <div class="progress">
@@ -504,7 +486,6 @@ under the License.
               </div>
             </form>
           </div>
-
           <!-- Step 2: Add zone -->
           <div class="setup-zone" zone-wizard-form="zone"
                zone-wizard-step-id="addZone">
@@ -515,7 +496,6 @@ under the License.
               <div class="select-container"></div>
             </div>
           </div>
-
           <!-- Step 3.1: Setup Physical Network -->
           <div class="setup-physical-network"
                zone-wizard-step-id="setupPhysicalNetwork"
@@ -534,7 +514,6 @@ under the License.
               <fmt:message key="message.setup.physical.network.during.zone.creation.basic"/>
             </div>
             <div class="button add new-physical-network"><span class="icon">&nbsp;</span><span><fmt:message key="label.add.physical.network"/></span></div>
-
             <!-- Traffic types drag area -->
             <div class="traffic-types-drag-area">
               <div class="header"><fmt:message key="label.traffic.types"/></div>
@@ -609,13 +588,11 @@ under the License.
                 </li>
               </ul>
             </div>
-
             <div class="drag-helper-icon"></div>
             <div class="content input-area">
               <form></form>
             </div>
           </div>
-
           <!-- Step 3.1b: Add Netscaler device -->
           <div class="setup-physical-network-basic"
                zone-wizard-step-id="addNetscalerDevice"
@@ -628,13 +605,11 @@ under the License.
               <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
               <li class="conditional storage-traffic"><fmt:message key="label.storage.traffic"/></li>
             </ul>
-
             <div class="info-desc"><fmt:message key="label.please.specify.netscaler.info"/></div>
             <div class="content input-area">
               <div class="select-container"></div>
             </div>
           </div>
-
           <!-- Step 3.2: Configure public traffic -->
           <div class="setup-public-traffic" zone-wizard-prefilter="addPublicNetwork"
                zone-wizard-step-id="configurePublicTraffic">
@@ -645,14 +620,12 @@ under the License.
               <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
               <li class="conditional storage-traffic"><fmt:message key="label.storage.traffic"/></li>
             </ul>
-
             <div class="info-desc" id="add_zone_public_traffic_desc">
               <span id="for_basic_zone" style="display:none"><fmt:message key="message.public.traffic.in.basic.zone"/></span>
 							<span id="for_advanced_zone" style="display:none"><fmt:message key="message.public.traffic.in.advanced.zone"/></span>
             </div>
             <div ui-custom="publicTrafficIPRange"></div>
           </div>
-
           <!-- Step 3.3: Add pod -->
           <div class="add-pod" zone-wizard-form="pod"
                zone-wizard-step-id="addPod">
@@ -663,7 +636,6 @@ under the License.
               <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
               <li class="conditional storage-traffic"><fmt:message key="label.storage.traffic"/></li>
             </ul>
-
             <div class="info-desc">
               <fmt:message key="message.add.pod.during.zone.creation"/>
             </div>
@@ -671,7 +643,6 @@ under the License.
               <div class="select-container"></div>
             </div>
           </div>
-
           <!-- Step 3.4: Configure guest traffic -->
           <div class="setup-guest-traffic"
                zone-wizard-form="guestTraffic"
@@ -684,7 +655,6 @@ under the License.
               <li class="guest-traffic active"><fmt:message key="label.guest.traffic"/></li>
               <li class="conditional storage-traffic"><fmt:message key="label.storage.traffic"/></li>
             </ul>
-
             <div class="info-desc" id="add_zone_guest_traffic_desc">
               <span id="for_basic_zone" style="display:none"><fmt:message key="message.guest.traffic.in.basic.zone"/></span>
 							<span id="for_advanced_zone" style="display:none"><fmt:message key="message.guest.traffic.in.advanced.zone"/></span>
@@ -693,7 +663,6 @@ under the License.
               <div class="select-container"></div>
             </div>
           </div>
-
           <!-- Step 3.5: Configure storage traffic -->
           <div class="setup-storage-traffic" zone-wizard-prefilter="configureStorageTraffic"
                zone-wizard-step-id="configureStorageTraffic">
@@ -704,13 +673,11 @@ under the License.
               <li class="guest-traffic"><fmt:message key="label.guest.traffic"/></li>
               <li class="storage-traffic active"><fmt:message key="label.storage.traffic"/></li>
             </ul>
-
             <div class="info-desc">
               <fmt:message key="message.storage.traffic"/>
             </div>
             <div ui-custom="storageTrafficIPRange"></div>
           </div>
-
           <!-- Step 4.1: Add cluster -->
           <div class="add-cluster" zone-wizard-form="cluster"
                zone-wizard-step-id="addCluster">
@@ -728,7 +695,6 @@ under the License.
               <div class="select-container"></div>
             </div>
           </div>
-
           <!-- Step 4.2: Add host -->
           <div class="add-cluster" zone-wizard-form="host"
                zone-wizard-step-id="addHost" zone-wizard-prefilter="addHost">
@@ -745,7 +711,6 @@ under the License.
               <div class="select-container"></div>
             </div>
           </div>
-
           <!-- Step 4.3: Add primary storage -->
           <div class="add-cluster" zone-wizard-form="primaryStorage" zone-wizard-prefilter="addPrimaryStorage"
                zone-wizard-step-id="addPrimaryStorage">
@@ -762,7 +727,6 @@ under the License.
               <div class="select-container"></div>
             </div>
           </div>
-
           <!-- Step 4.4: Add secondary storage -->
           <div class="add-cluster" zone-wizard-form="secondaryStorage"
                zone-wizard-step-id="addSecondaryStorage">
@@ -779,7 +743,6 @@ under the License.
               <div class="select-container"></div>
             </div>
           </div>
-
           <!-- Step 5: Launch -->
           <div class="review" zone-wizard-step-id="launch">
             <div class="main-desc pre-setup"><fmt:message key="message.launch.zone"/></div>
@@ -793,7 +756,6 @@ under the License.
             </div>
           </div>
         </div>
-
         <!-- Buttons -->
         <div class="buttons">
           <div class="button previous"><span><fmt:message key="label.previous"/></span></div>
@@ -801,7 +763,6 @@ under the License.
           <div class="button next"><span><fmt:message key="label.next"/></span></div>
         </div>
       </div>
-
       <!-- Network chart -->
       <div class="network-chart normal">
         <ul>
@@ -819,7 +780,6 @@ under the License.
           </li>
         </ul>
       </div>
-
       <!-- Static NAT network chart -->
       <div class="network-chart static-nat">
         <ul>
@@ -834,7 +794,6 @@ under the License.
           </li>
         </ul>
       </div>
-
       <!-- Project dashboard -->
       <div class="project-dashboard-view">
         <div class="overview-area">
@@ -902,7 +861,6 @@ under the License.
             </div>
           </div>
         </div>
-
         <div class="info-boxes">
           <!-- Networking and security -->
           <div class="info-box networking-and-security">
@@ -946,7 +904,6 @@ under the License.
               </li>
             </ul>
           </div>
-
           <!-- Events -->
           <div class="info-box events">
             <div class="title">
@@ -965,7 +922,6 @@ under the License.
           </div>
         </div>
       </div>
-
       <!-- System dashboard -->
       <div class="system-dashboard-view">
         <div class="toolbar">