diff --git a/ui/index.jsp b/ui/index.jsp
index dc99232207a..a83467bfdb2 100644
--- a/ui/index.jsp
+++ b/ui/index.jsp
@@ -35,22 +35,18 @@
               <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">
@@ -63,7 +59,6 @@
           </div>
         </form>
       </div>
-
       <!-- Instance wizard -->
       <div class="multi-wizard instance-wizard">
         <div class="progress">
@@ -92,7 +87,6 @@
                     </select>
                   </div>
                 </div>
-
                 <!-- Select template -->
                 <div class="section select-template">
                   <h3><fmt:message key="label.select.iso.or.template" /></h3>
@@ -280,7 +274,6 @@
                   </div>
                 </div>
               </div>
-
               <!-- Step 5c: Select security group -->
               <div class="wizard-step-conditional select-security-group">
                 <div class="main-desc">
@@ -292,7 +285,6 @@
                 </div>
               </div>
             </div>
-
             <!-- Step 6: Review -->
             <div class="step review" wizard-step-id="review">
               <div class="main-desc">
@@ -309,7 +301,6 @@
                       <input type="text" name="displayname" />
                     </div>
                   </div>
-
                   <!-- Add to group -->
                   <div class="select odd">
                     <div class="name">
@@ -319,7 +310,6 @@
                       <input type="text" name="groupname" />
                     </div>
                   </div>
-
                   <!-- Zone -->
                   <div class="select">
                     <div class="name">
@@ -332,7 +322,6 @@
                       <a href="1"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
-
                   <!-- Hypervisor -->
                   <div class="select odd">
                     <div class="name">
@@ -345,7 +334,6 @@
                       <a href="1"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
-
                   <!-- Template -->
                   <div class="select">
                     <div class="name">
@@ -358,7 +346,6 @@
                       <a href="2"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
-
                   <!-- Service offering -->
                   <div class="select odd">
                     <div class="name">
@@ -371,7 +358,6 @@
                       <a href="3"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
-
                   <!-- Data disk offering -->
                   <div class="select">
                     <div class="name">
@@ -384,7 +370,6 @@
                       <a href="4"><fmt:message key="label.edit"/></a>
                     </div>
                   </div>
-
                   <!-- Primary network -->
                   <div class="select odd">
                     <div class="name">
@@ -402,7 +387,6 @@
             </div>
           </div>
         </form>
-
         <!-- Computer diagram -->
         <div class="diagram">
           <div>
@@ -415,7 +399,6 @@
           <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>
@@ -423,7 +406,6 @@
           <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">
@@ -469,7 +451,6 @@
               </div>
             </form>
           </div>
-
           <!-- Step 2: Add zone -->
           <div class="setup-zone" zone-wizard-form="zone"
                zone-wizard-step-id="addZone">
@@ -480,7 +461,6 @@
               <div class="select-container"></div>
             </div>
           </div>
-
           <!-- Step 3.1: Setup Physical Network -->
           <div class="setup-physical-network"
                zone-wizard-step-id="setupPhysicalNetwork"
@@ -499,7 +479,6 @@
               <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>
@@ -574,13 +553,11 @@
                 </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"
@@ -593,13 +570,11 @@
               <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">
@@ -610,14 +585,12 @@
               <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">
@@ -628,7 +601,6 @@
               <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>
@@ -636,7 +608,6 @@
               <div class="select-container"></div>
             </div>
           </div>
-
           <!-- Step 3.4: Configure guest traffic -->
           <div class="setup-guest-traffic"
                zone-wizard-form="guestTraffic"
@@ -649,7 +620,6 @@
               <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>
@@ -658,7 +628,6 @@
               <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">
@@ -669,13 +638,11 @@
               <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">
@@ -693,7 +660,6 @@
               <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">
@@ -710,7 +676,6 @@
               <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">
@@ -727,7 +692,6 @@
               <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">
@@ -744,7 +708,6 @@
               <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>
@@ -758,7 +721,6 @@
             </div>
           </div>
         </div>
-
         <!-- Buttons -->
         <div class="buttons">
           <div class="button previous"><span><fmt:message key="label.previous"/></span></div>
@@ -766,7 +728,6 @@
           <div class="button next"><span><fmt:message key="label.next"/></span></div>
         </div>
       </div>
-
       <!-- Network chart -->
       <div class="network-chart normal">
         <ul>
@@ -784,7 +745,6 @@
           </li>
         </ul>
       </div>
-
       <!-- Static NAT network chart -->
       <div class="network-chart static-nat">
         <ul>
@@ -799,7 +759,6 @@
           </li>
         </ul>
       </div>
-
       <!-- Project dashboard -->
       <div class="project-dashboard-view">
         <div class="overview-area">
@@ -867,7 +826,6 @@
             </div>
           </div>
         </div>
-
         <div class="info-boxes">
           <!-- Networking and security -->
           <div class="info-box networking-and-security">
@@ -911,7 +869,6 @@
               </li>
             </ul>
           </div>
-
           <!-- Events -->
           <div class="info-box events">
             <div class="title">
@@ -930,7 +887,6 @@
           </div>
         </div>
       </div>
-
       <!-- System dashboard -->
       <div class="system-dashboard-view">
         <div class="toolbar">