diff --git a/themew2.php b/themew2.php
index 2c0cb00..5a39bb0 100644
--- a/themew2.php
+++ b/themew2.php
@@ -8,7 +8,7 @@
    require 'dspcnt.php';
 
    $xml=simplexml_load_file("data/website".$b.".xml") or die("Error: Cannot create object");
-   $page = $xml->xpath('/website/page');
+   $page = $xml->xpath("/website/page[name!='']");
    
    function ic_html($pname) {
       if (strpos(" ".$pname,chr(0xef))==1) $rt = '<i class="fa">'.substr($pname,0,3).'</i> '.substr($pname,4);
@@ -41,9 +41,9 @@ function ic_html($pname) {
   </div>
   <div class="w3-bar-block">
    <?php
-   for($i=1;$i<=6;$i++) {
-     if(strlen($page[$i-1]->name)>2) 
-        echo "<a href='#".$i."' onclick='w3_close()' class='w3-bar-item w3-button w3-hover-white'>" . ic_html($page[$i-1]->name) . "</a>";
+   $i=1;
+   foreach ($page as $item) {
+      echo "<a href='#".$i++."' onclick='w3_close()' class='w3-bar-item w3-button w3-hover-white'>" . ic_html($item->name) . "</a>";
    }
    ?>  
 </nav>
@@ -64,17 +64,16 @@ function ic_html($pname) {
     <h1 class="w3-jumbo"><b><?php echo strip_tags($xml->title) ?></b></h1>
   </div>
 <?php
-   for($i=1;$i<=6;$i++) {
-      if(strlen($page[$i-1]->name)>2) {
-         echo "<div class='w3-container' style='margin-top:80px' id='".$i."' lang='".$page[$i-1]['language']."'>";
-         echo "<h1 class='w3-xxxlarge w3-text-red'><b>".$page[$i-1]->name.".</b></h1>";
-         echo "<hr style='width:50px;border:5px solid red' class='w3-round'>";
-      }
-      if(strlen($page[$i-1]->image)>4)
-         echo "<img class='w3-image' src='".$page[$i-1]->image."' style='width:100%'>\n";
-      echo trim($page[$i-1]->contents);
+   $i=1;
+   foreach ($page as $item) {
+	  echo "<div class='w3-container' style='margin-top:80px' id='".$i++."' lang='".$item['language']."'>";
+	  echo "<h1 class='w3-xxxlarge w3-text-red'><b>".$item->name.".</b></h1>";
+	  echo "<hr style='width:50px;border:5px solid red' class='w3-round'>";
+      if(strlen($item->image)>4)
+         echo "<img class='w3-image' src='".$item->image."' style='width:100%'>\n";
+      echo trim($item->contents);
       echo "</div>";
-      if($page[$i-1]['type']=="comments") {
+      if($item['type']=="comments") {
 ?>
      <!-- begin htmlcommentbox.com -->
      <div class="w3-container" id="HCB_comment_box"><a href="https://www.htmlcommentbox.com">HTML Comment Box</a> is loading comments...</div>
@@ -82,7 +81,7 @@ function ic_html($pname) {
      <script type="text/javascript" language="javascript" id="hcb"> /*<!--*/ if(!window.hcb_user){hcb_user={  };} (function(){s=document.createElement("script");s.setAttribute("type","text/javascript");s.setAttribute("src", "https://www.htmlcommentbox.com/jread?page="+escape((window.hcb_user && hcb_user.PAGE)||(""+window.location)).replace("+","%2B")+"&opts=470&num=10");if (typeof s!="undefined") document.getElementsByTagName("head")[0].appendChild(s);})(); /*-->*/ </script>
      <!-- end htmlcommentbox.com --><?php
       }
-      if($page[$i-1]['type']=="form") {
+      if($item['type']=="form") {
 ?>
      <form action="#alert" class="w3-container" role="form" method="post">
      <div class="w3-row">
@@ -117,7 +116,7 @@ function ic_html($pname) {
            echo "<b>Missing Name or Contact Info.</b>";
            echo "</div>";
         }
-     }
+      }
    }
 ?>
 
diff --git a/themew3.php b/themew3.php
index 15bdc5d..c9868bf 100644
--- a/themew3.php
+++ b/themew3.php
@@ -8,7 +8,7 @@
    require 'dspcnt.php';
 
    $xml=simplexml_load_file("data/website".$b.".xml") or die("Error: Cannot create object");
-   $page = $xml->xpath('/website/page');
+   $page = $xml->xpath("/website/page[name!='' and position()<=4]");
    
    function ic_html($pname) {
       if (strpos(" ".$pname,chr(0xef))==1) $rt = '<i class="fa">'.substr($pname,0,3).'</i> '.substr($pname,4);
@@ -38,12 +38,11 @@ function ic_html($pname) {
 <div class="w3-top">
   <div class="w3-row w3-large w3-light-grey">
    <?php
-   for($i=1;$i<=4;$i++) {
-     if(strlen($page[$i-1]->name)>2) {
-        echo "<div class='w3-col s3'>";
-        echo "<a href='#".$i."' class='w3-button w3-block'>" . ic_html($page[$i-1]->name) . "</a>";
-        echo "</div>";
-     }
+   $i=1;
+   foreach ($page as $item) {
+	 echo "<div class='w3-col s3'>";
+	 echo "<a href='#".$i++."' class='w3-button w3-block'>" . ic_html($item->name) . "</a>";
+	 echo "</div>";
    }
    ?>  
   </div>
@@ -60,21 +59,19 @@ function ic_html($pname) {
   </div>
 
 <?php
-   for($i=1;$i<=6;$i++) {
-      if(strlen($page[$i-1]->image)>4)
-         echo "<img class='mySlides' src='".$page[$i-1]->image."' style='width:100%'>\n";
-   }
+   $img = $xml->xpath("/website/page/image[string-length()!=0]");
+   foreach ($img as $item)
+      echo "<img class='mySlides' src='".$item."' style='width:100%'>\n";
 ?>
 </div>
 
 <?php
-   for($i=1;$i<=4;$i++) {
-      if(strlen($page[$i-1]->name)>2) {
-         echo "<div class='w3-padding-64' id='".$i."' lang='".$page[$i-1]['language']."'>";
-         echo trim($page[$i-1]->contents);
-         echo "</div>";
-      }
-      if($page[$i-1]['type']=="comments") {
+   $i=1;
+   foreach ($page as $item) {
+	  echo "<div class='w3-padding-64' id='".$i++."' lang='".$item['language']."'>";
+	  echo trim($item->contents);
+	  echo "</div>";
+      if($item['type']=="comments") {
 ?>
      <!-- begin htmlcommentbox.com -->
      <div class="w3-container" id="HCB_comment_box"><a href="https://www.htmlcommentbox.com">HTML Comment Box</a> is loading comments...</div>
@@ -82,7 +79,7 @@ function ic_html($pname) {
      <script type="text/javascript" language="javascript" id="hcb"> /*<!--*/ if(!window.hcb_user){hcb_user={  };} (function(){s=document.createElement("script");s.setAttribute("type","text/javascript");s.setAttribute("src", "https://www.htmlcommentbox.com/jread?page="+escape((window.hcb_user && hcb_user.PAGE)||(""+window.location)).replace("+","%2B")+"&opts=470&num=10");if (typeof s!="undefined") document.getElementsByTagName("head")[0].appendChild(s);})(); /*-->*/ </script>
      <!-- end htmlcommentbox.com --><?php
       }
-      if($page[$i-1]['type']=="form") {
+      if($item['type']=="form") {
 ?>
      <form action="#alert" class="w3-container" role="form" method="post">
      <div class="w3-row">
diff --git a/themew4.php b/themew4.php
index 45eb62b..be47fe9 100644
--- a/themew4.php
+++ b/themew4.php
@@ -8,7 +8,7 @@
    require 'dspcnt.php';
 
    $xml=simplexml_load_file("data/website".$b.".xml") or die("Error: Cannot create object");
-   $page = $xml->xpath('/website/page');
+   $page = $xml->xpath("/website/page[name!='']");
    
    function ic_html($pname) {
       if (strpos(" ".$pname,chr(0xef))==1) $rt = '<i class="fa">'.substr($pname,0,3).'</i> '.strtoupper(substr($pname,4));
@@ -60,11 +60,9 @@ function ic_strip($pname) {
     <!-- Right-sided navbar links -->
     <div class="w3-right w3-hide-small">
    <?php
-   for($i=1;$i<=6;$i++) {
-     if(strlen($page[$i-1]->name)>2) {
-        echo "<a href='#p".$i."' class='w3-bar-item w3-button'>" . ic_html($page[$i-1]->name) . "</a>";
-     }
-   }
+   $i=1;
+   foreach ($page as $item)
+      echo "<a href='#p".$i++."' class='w3-bar-item w3-button'>" . ic_html($item->name) . "</a>";
    ?>  
     </div>
     <!-- Hide right-floated links on small screens and replace them with a menu icon -->
@@ -79,11 +77,9 @@ function ic_strip($pname) {
 <nav class="w3-sidebar w3-bar-block w3-black w3-card-2 w3-animate-left w3-hide-medium w3-hide-large" style="display:none" id="mySidebar">
   <a href="javascript:void(0)" onclick="w3_close()" class="w3-bar-item w3-button w3-large w3-padding-16">Close &#xD7;</a>
    <?php
-   for($i=1;$i<=6;$i++) {
-     if(strlen($page[$i-1]->name)>2) {
-        echo "<a href='#p".$i."' onclick='w3_close()' class='w3-bar-item w3-button'>" . ic_strip($page[$i-1]->name) . "</a>";
-     }
-   }
+   $i=1;
+   foreach ($page as $item)
+      echo "<a href='#p".$i++."' onclick='w3_close()' class='w3-bar-item w3-button'>" . ic_strip($item->name) . "</a>";
    ?>  
 </nav>
 
@@ -106,27 +102,27 @@ function ic_strip($pname) {
 </header>
 
 <?php
-   for($i=1;$i<=6;$i++) {
-      if($page[$i-1]['type']=="page")
-         if(strlen($page[$i-1]->name)>2) {     
-            echo "<div class='w3-container' style='padding:128px 16px' id='p".$i."' lang='".$page[$i-1]['language']."'>";
-            echo trim($page[$i-1]->contents);
-            echo "</div>";
-         }
-      if($page[$i-1]['type']=="comments") {
+   $i=1;
+   foreach ($page as $item) {
+      if($item['type']=="page") {
+		echo "<div class='w3-container' style='padding:128px 16px' id='p".$i++."' lang='".$item['language']."'>";
+		echo trim($item->contents);
+		echo "</div>";
+	  }
+      if($item['type']=="comments") {
 
      // begin htmlcommentbox.com -->
-     echo "<div id='p".$i."'></div>";
+     echo "<div id='p".$i++."'></div>";
      echo "<div class='w3-container' id='HCB_comment_box' style='padding:128px 16px'>";
 ?>   <a href="https://www.htmlcommentbox.com">HTML Comment Box</a> is loading comments...</div>
      <link rel="stylesheet" type="text/css" href="https://www.htmlcommentbox.com/static/skins/default/skin.css" />
      <script type="text/javascript" language="javascript" id="hcb"> /*<!--*/ if(!window.hcb_user){hcb_user={  };} (function(){s=document.createElement("script");s.setAttribute("type","text/javascript");s.setAttribute("src", "https://www.htmlcommentbox.com/jread?page="+escape((window.hcb_user && hcb_user.PAGE)||(""+window.location)).replace("+","%2B")+"&opts=470&num=10");if (typeof s!="undefined") document.getElementsByTagName("head")[0].appendChild(s);})(); /*-->*/ </script>
      <!-- end htmlcommentbox.com --><?php
       }
-      if($page[$i-1]['type']=="form") {
+      if($item['type']=="form") {
 
-     echo "<div class='w3-container w3-light-grey' style='padding:128px 16px' id='p".$i."'>";
-     echo trim($page[$i-1]->contents);
+     echo "<div class='w3-container w3-light-grey' style='padding:128px 16px' id='p".$i++."'>";
+     echo trim($item->contents);
 ?>   <div class="w3-row-padding" style="margin-top:64px">
      <div class="w3-half">
        <form action="#alert" class="w3-container" role="form" method="post">
@@ -161,7 +157,7 @@ function ic_strip($pname) {
            echo "<b>Missing Name or Contact Info.</b>";
            echo "</div>";
         }
-     }
+      }
    }
 ?>   </div>  
      </div>
diff --git a/themew5.php b/themew5.php
index 65252d9..bc1b15f 100644
--- a/themew5.php
+++ b/themew5.php
@@ -8,7 +8,7 @@
    require 'dspcnt.php';
 
    $xml=simplexml_load_file("data/website".$b.".xml") or die("Error: Cannot create object");
-   $page = $xml->xpath('/website/page');
+   $page = $xml->xpath("/website/page[name!='' and position()<=4]");
    
    function icon($pname) {
       if (strpos(" ".$pname,chr(0xef))==1) $rt = substr($pname,0,3);
@@ -53,12 +53,11 @@ function ic_strip($pname) {
     <p><?php echo ic_strip($page[0]->name) ?></p>
   </a>
    <?php
-   for($i=2;$i<=4;$i++) {
-     if(strlen($page[$i-1]->name)>2) {
+   $i=0;
+   foreach ($page as $item)
+     if(++$i!=1)
         echo "<a href='#p".$i."' class='w3-bar-item w3-button w3-padding-large w3-hover-black'><i class='fa w3-xxlarge'>"
-        . icon($page[$i-1]->name) . "</i><p>" . ic_strip($page[$i-1]->name) . "</p></a>";
-     }
-   }
+        . icon($item->name) . "</i><p>" . ic_strip($item->name) . "</p></a>";
    ?>  
 </nav>
 
@@ -66,12 +65,10 @@ function ic_strip($pname) {
 <div class="w3-top w3-hide-large w3-hide-medium" id="myNavbar">
   <div class="w3-bar w3-black w3-opacity w3-hover-opacity-off w3-center w3-small">
    <?php
-   for($i=1;$i<=4;$i++) {
-     if(strlen($page[$i-1]->name)>2) {
-        echo "<a href='#p".$i."' class='w3-bar-item w3-button' style='width:25% !important'>"
-        . ic_strip($page[$i-1]->name) . "</a>";
-     }
-   }
+   $i=1;
+   foreach ($page as $item)
+	 echo "<a href='#p".$i++."' class='w3-bar-item w3-button' style='width:25% !important'>"
+	 . ic_strip($item->name) . "</a>";
    ?>  
   </div>
 </div>
@@ -87,66 +84,68 @@ function ic_strip($pname) {
   </header>
 
 <?php
-   for($i=2;$i<=4;$i++) {
-      if($page[$i-1]['type']=="page")
-         if(strlen($page[$i-1]->name)>2) {     
-            echo "<div class='w3-padding-64 w3-content' id='p".$i."' lang='".$page[$i-1]['language']."'>";
-            echo trim($page[$i-1]->contents);
-            echo "</div>";
-         }
-      if($page[$i-1]['type']=="comments") {
+   $i=0;
+   foreach ($page as $item) {
+	   if (++$i!=1) {
+		  if($item['type']=="page") {
+			echo "<div class='w3-padding-64 w3-content' id='p".$i."' lang='".$item['language']."'>";
+			echo trim($item->contents);
+			echo "</div>";
+		  }
+		  if($item['type']=="comments") {
 
-     // begin htmlcommentbox.com -->
-     echo "<div id='p".$i."'></div>";
-     echo "<div class='w3-padding-64 w3-content w3-black' id='HCB_comment_box'>";
-?>   <a href="https://www.htmlcommentbox.com">HTML Comment Box</a> is loading comments...</div>
-     <link rel="stylesheet" type="text/css" href="https://www.htmlcommentbox.com/static/skins/default/skin.css" />
-     <script type="text/javascript" language="javascript" id="hcb"> /*<!--*/ if(!window.hcb_user){hcb_user={  };} (function(){s=document.createElement("script");s.setAttribute("type","text/javascript");s.setAttribute("src", "https://www.htmlcommentbox.com/jread?page="+escape((window.hcb_user && hcb_user.PAGE)||(""+window.location)).replace("+","%2B")+"&opts=470&num=10");if (typeof s!="undefined") document.getElementsByTagName("head")[0].appendChild(s);})(); /*-->*/ </script>
-     <!-- end htmlcommentbox.com --><?php
-      }
-      if($page[$i-1]['type']=="form") {
+		 // begin htmlcommentbox.com -->
+		 echo "<div id='p".$i."'></div>";
+		 echo "<div class='w3-padding-64 w3-content w3-black' id='HCB_comment_box'>";
+	?>   <a href="https://www.htmlcommentbox.com">HTML Comment Box</a> is loading comments...</div>
+		 <link rel="stylesheet" type="text/css" href="https://www.htmlcommentbox.com/static/skins/default/skin.css" />
+		 <script type="text/javascript" language="javascript" id="hcb"> /*<!--*/ if(!window.hcb_user){hcb_user={  };} (function(){s=document.createElement("script");s.setAttribute("type","text/javascript");s.setAttribute("src", "https://www.htmlcommentbox.com/jread?page="+escape((window.hcb_user && hcb_user.PAGE)||(""+window.location)).replace("+","%2B")+"&opts=470&num=10");if (typeof s!="undefined") document.getElementsByTagName("head")[0].appendChild(s);})(); /*-->*/ </script>
+		 <!-- end htmlcommentbox.com --><?php
+		  }
+		  if($item['type']=="form") {
 
-     echo "<div class='w3-padding-64 w3-content' id='p".$i."'>";
-     echo trim($page[$i-1]->contents);
-?>   <div class="w3-row-padding">
-     <div class="w3-half">
-       <form action="#alert" class="w3-container" role="form" method="post">
-       <p>
-          <label for="name">Name:</label>
-          <input type="text" class="w3-input w3-border" name="name">
-       </p>
-       <p>
-          <label for="phone">Contact Phone #:</label>
-          <input type="text" class="w3-input w3-border" name="phone">
-       </p>
-       <p>
-          <label for="email">Email Address:</label>
-          <input type="email" class="w3-input w3-border" name="email">
-       </p>
-       <p>
-          <label for="message">Message:</label>
-          <textarea class="w3-input w3-border" rows="5" name="message"></textarea>
-       </p>
-       <button class="w3-button w3-light-grey w3-margin-bottom" type="submit" id="alert">
-            <i class="fa fa-paper-plane"></i> SEND MESSAGE
-          </button>
-       </form>
-<?php
-      if ($name!="")
-        if(sendDb($name,$phone,$email,$message)) {
-           echo "<div class='w3-panel w3-green' id='alert'>";
-           echo "<b>Contact information submitted.  We will contact you as soon as possible.</b>";
-           echo "</div>";
-        } else {
-           echo "<div class='w3-panel w3-blue' id='alert'>";
-           echo "<b>Missing Name or Contact Info.</b>";
-           echo "</div>";
-        }
-?>
-     </div>
-     </div>
-     </div><?php
-     }
+		 echo "<div class='w3-padding-64 w3-content' id='p".$i."'>";
+		 echo trim($item->contents);
+	?>   <div class="w3-row-padding">
+		 <div class="w3-half">
+		   <form action="#alert" class="w3-container" role="form" method="post">
+		   <p>
+			  <label for="name">Name:</label>
+			  <input type="text" class="w3-input w3-border" name="name">
+		   </p>
+		   <p>
+			  <label for="phone">Contact Phone #:</label>
+			  <input type="text" class="w3-input w3-border" name="phone">
+		   </p>
+		   <p>
+			  <label for="email">Email Address:</label>
+			  <input type="email" class="w3-input w3-border" name="email">
+		   </p>
+		   <p>
+			  <label for="message">Message:</label>
+			  <textarea class="w3-input w3-border" rows="5" name="message"></textarea>
+		   </p>
+		   <button class="w3-button w3-light-grey w3-margin-bottom" type="submit" id="alert">
+				<i class="fa fa-paper-plane"></i> SEND MESSAGE
+			  </button>
+		   </form>
+	<?php
+		  if ($name!="")
+			if(sendDb($name,$phone,$email,$message)) {
+			   echo "<div class='w3-panel w3-green' id='alert'>";
+			   echo "<b>Contact information submitted.  We will contact you as soon as possible.</b>";
+			   echo "</div>";
+			} else {
+			   echo "<div class='w3-panel w3-blue' id='alert'>";
+			   echo "<b>Missing Name or Contact Info.</b>";
+			   echo "</div>";
+			}
+	?>
+		 </div>
+		 </div>
+		 </div><?php
+		 }
+	   }
    }
 ?>  
     <!-- Footer -->
diff --git a/themew6.php b/themew6.php
index 0c28701..a6f1353 100644
--- a/themew6.php
+++ b/themew6.php
@@ -8,7 +8,7 @@
    require 'dspcnt.php';
 
    $xml=simplexml_load_file("data/website".$b.".xml") or die("Error: Cannot create object");
-   $page = $xml->xpath('/website/page');
+   $page = $xml->xpath("/website/page[name!='' and position()<=3]");
    
    function ic_html($pname) {
       if (strpos(" ".$pname,chr(0xef))==1) $rt = '<i class="fa">'.substr($pname,0,3).'</i> '.substr($pname,4);
@@ -36,10 +36,9 @@ function ic_html($pname) {
     <!-- Float links to the right. Hide them on small screens -->
     <div class="w3-right w3-hide-small">
    <?php
-   for($i=1;$i<=3;$i++) {
-     if(strlen($page[$i-1]->name)>2) 
-        echo "<a href='#p".$i."' class='w3-bar-item w3-button'>" . ic_html($page[$i-1]->name) . "</a>";
-   }
+   $i=1;
+   foreach ($page as $item)
+      echo "<a href='#p".$i++."' class='w3-bar-item w3-button'>" . ic_html($item->name) . "</a>";
    ?>  
     </div>
   </div>
@@ -57,44 +56,43 @@ function ic_html($pname) {
 <div class="w3-content w3-padding" style="max-width:1564px">
 
 <?php
-   for($i=1;$i<=3;$i++) {
-      if(strlen($page[$i-1]->name)>2) {
-         echo "<div class='w3-container w3-padding-32' id='p".$i."' lang='".$page[$i-1]['language']."'>";
-         echo "<h3 class='w3-border-bottom w3-border-light-grey w3-padding-16'>".$page[$i-1]->name."</h3>";
-         echo trim($page[$i-1]->contents);
-         if($page[$i-1]['type']=="comments") {
+   $i=1;
+   foreach ($page as $item) {
+	 echo "<div class='w3-container w3-padding-32' id='p".$i++."' lang='".$item['language']."'>";
+	 echo "<h3 class='w3-border-bottom w3-border-light-grey w3-padding-16'>".$item->name."</h3>";
+	 echo trim($item->contents);
+	 if($item['type']=="comments") {
 
-         // begin htmlcommentbox.com -->
-         echo "<div id='HCB_comment_box'>";
-    ?>   <a href="https://www.htmlcommentbox.com">HTML Comment Box</a> is loading comments...</div>
-         <link rel="stylesheet" type="text/css" href="https://www.htmlcommentbox.com/static/skins/default/skin.css" />
-         <script type="text/javascript" language="javascript" id="hcb"> /*<!--*/ if(!window.hcb_user){hcb_user={  };} (function(){s=document.createElement("script");s.setAttribute("type","text/javascript");s.setAttribute("src", "https://www.htmlcommentbox.com/jread?page="+escape((window.hcb_user && hcb_user.PAGE)||(""+window.location)).replace("+","%2B")+"&opts=470&num=10");if (typeof s!="undefined") document.getElementsByTagName("head")[0].appendChild(s);})(); /*-->*/ </script>
-         <!-- end htmlcommentbox.com --><?php
-          }
-          if($page[$i-1]['type']=="form") {
-    ?>    <form action="#alert" role="form" method="post">
-              <input type="text" class="w3-input w3-section" placeholder="Name" name="name">
-              <input type="text" class="w3-input w3-section" placeholder="Contact Phone #" name="phone">
-              <input type="email" class="w3-input w3-section" placeholder="Email" name="email">
-              <input type="text" class="w3-input w3-section" placeholder="Message" name="message">
-              <button class="w3-button w3-black w3-section" type="submit" id="alert">
-                <i class="fa fa-paper-plane"></i> SEND MESSAGE
-              </button>
-           </form>
+	 // begin htmlcommentbox.com -->
+	 echo "<div id='HCB_comment_box'>";
+?>   <a href="https://www.htmlcommentbox.com">HTML Comment Box</a> is loading comments...</div>
+	 <link rel="stylesheet" type="text/css" href="https://www.htmlcommentbox.com/static/skins/default/skin.css" />
+	 <script type="text/javascript" language="javascript" id="hcb"> /*<!--*/ if(!window.hcb_user){hcb_user={  };} (function(){s=document.createElement("script");s.setAttribute("type","text/javascript");s.setAttribute("src", "https://www.htmlcommentbox.com/jread?page="+escape((window.hcb_user && hcb_user.PAGE)||(""+window.location)).replace("+","%2B")+"&opts=470&num=10");if (typeof s!="undefined") document.getElementsByTagName("head")[0].appendChild(s);})(); /*-->*/ </script>
+	 <!-- end htmlcommentbox.com --><?php
+	  }
+	  if($item['type']=="form") {
+?>    <form action="#alert" role="form" method="post">
+		  <input type="text" class="w3-input w3-section" placeholder="Name" name="name">
+		  <input type="text" class="w3-input w3-section" placeholder="Contact Phone #" name="phone">
+		  <input type="email" class="w3-input w3-section" placeholder="Email" name="email">
+		  <input type="text" class="w3-input w3-section" placeholder="Message" name="message">
+		  <button class="w3-button w3-black w3-section" type="submit" id="alert">
+			<i class="fa fa-paper-plane"></i> SEND MESSAGE
+		  </button>
+	   </form>
 <?php
-          if ($name!="")
-            if(sendDb($name,$phone,$email,$message)) {
-               echo "<div class='w3-panel w3-green' id='alert'>";
-               echo "<b>Contact information submitted.  We will contact you as soon as possible.</b>";
-               echo "</div>";
-            } else {
-               echo "<div class='w3-panel w3-blue' id='alert'>";
-               echo "<b>Missing Name or Contact Info.</b>";
-               echo "</div>";
-            }
-     }
-     echo "</div>";
-   }
+		  if ($name!="")
+			if(sendDb($name,$phone,$email,$message)) {
+			   echo "<div class='w3-panel w3-green' id='alert'>";
+			   echo "<b>Contact information submitted.  We will contact you as soon as possible.</b>";
+			   echo "</div>";
+			} else {
+			   echo "<div class='w3-panel w3-blue' id='alert'>";
+			   echo "<b>Missing Name or Contact Info.</b>";
+			   echo "</div>";
+			}
+      }
+      echo "</div>";
    }
 ?>
   
diff --git a/themew7.php b/themew7.php
index 7f42056..ce4f46d 100644
--- a/themew7.php
+++ b/themew7.php
@@ -8,7 +8,7 @@
    require 'dspcnt.php';
 
    $xml=simplexml_load_file("data/website".$b.".xml") or die("Error: Cannot create object");
-   $page = $xml->xpath('/website/page');
+   $page = $xml->xpath("/website/page[name!='']");
    
    function ic_html($pname) {
       if (strpos(" ".$pname,chr(0xef))==1) $rt = '<i class="fa">'.substr($pname,0,3).'</i> '.strtoupper(substr($pname,4));
@@ -104,10 +104,9 @@ function ic_strip($pname) {
     </a>
     <a href="#home" class="w3-bar-item w3-button">HOME</a>
    <?php
-   for($i=1;$i<=6;$i++) {
-     if(strlen($page[$i-1]->name)>2) 
-        echo "<a href='#p".$i."' class='w3-bar-item w3-button w3-hide-small'>" . ic_html($page[$i-1]->name) . "</a>";
-   }
+   $i=1;
+   foreach ($page as $item)
+      echo "<a href='#p".$i++."' class='w3-bar-item w3-button w3-hide-small'>" . ic_html($item->name) . "</a>";
    ?>  
     <a href="#" class="w3-bar-item w3-button w3-hide-small w3-right w3-hover-red">
       <i class="fa fa-search"></i>
@@ -117,10 +116,9 @@ function ic_strip($pname) {
   <!-- Navbar on small screens -->
   <div id="navDemo" class="w3-bar-block w3-white w3-hide w3-hide-large w3-hide-medium">
    <?php
-   for($i=1;$i<=6;$i++) {
-     if(strlen($page[$i-1]->name)>2) 
-        echo "<a href='#p".$i."' class='w3-bar-item w3-button' onclick='toggleFunction()'>" . ic_strip($page[$i-1]->name) . "</a>";
-   }
+   $i=1;
+   foreach ($page as $item)
+      echo "<a href='#p".$i++."' class='w3-bar-item w3-button' onclick='toggleFunction()'>" . ic_strip($item->name) . "</a>";
    ?>  
     <a href="#" class="w3-bar-item w3-button">SEARCH</a>
   </div>
@@ -133,55 +131,54 @@ function ic_strip($pname) {
   </div>
 </div>
 <?php
-   for($i=1;$i<=6;$i++) {
-      if(strlen($page[$i-1]->name)>2) {
-         if(($i > 1) && (strlen($page[$i-1]->image)>4)) {
-            echo "<div class='bgimg-".$i." w3-display-container w3-opacity-min'>";
-            echo "<div class='w3-display-middle'>";
-            echo "<span class='w3-xxlarge w3-text-white w3-wide'>".ic_strip($page[$i-1]->name)."</span>";
-            echo "</div>";
-            echo "</div>";
-         }
-         echo "<div class='w3-content w3-container w3-padding-64' id='p".$i."' lang='".$page[$i-1]['language']."'>";
-         echo trim($page[$i-1]->contents);
-         if($page[$i-1]['type']=="comments") {
-
-         // begin htmlcommentbox.com -->
-         echo "<div id='HCB_comment_box'>";
-    ?>   <a href="https://www.htmlcommentbox.com">HTML Comment Box</a> is loading comments...</div>
-         <link rel="stylesheet" type="text/css" href="https://www.htmlcommentbox.com/static/skins/default/skin.css" />
-         <script type="text/javascript" language="javascript" id="hcb"> /*<!--*/ if(!window.hcb_user){hcb_user={  };} (function(){s=document.createElement("script");s.setAttribute("type","text/javascript");s.setAttribute("src", "https://www.htmlcommentbox.com/jread?page="+escape((window.hcb_user && hcb_user.PAGE)||(""+window.location)).replace("+","%2B")+"&opts=470&num=10");if (typeof s!="undefined") document.getElementsByTagName("head")[0].appendChild(s);})(); /*-->*/ </script>
-         <!-- end htmlcommentbox.com --><?php
-          }
-          if($page[$i-1]['type']=="form") {
-    ?>   <div>
-         <div class="w3-half">    
-           <form action="#alert" role="form" method="post">
-              <p><input type="text" class="w3-input w3-border" placeholder="Name" name="name"></p>
-              <p><input type="text" class="w3-input w3-border" placeholder="Contact Phone #" name="phone"></p>
-              <p><input type="email" class="w3-input w3-border" placeholder="Email" name="email"></p>
-              <p><input type="text" class="w3-input w3-border" placeholder="Message" name="message"></p>
-              <p><button class="w3-button w3-black w3-border" type="submit" id="alert">
-                <i class="fa fa-paper-plane"></i> SEND MESSAGE
-              </button></p>
-           </form>
+   $i=0;
+   foreach ($page as $item) {
+	 if((++$i>1) && (strlen($item->image)>4)) {
+		echo "<div class='bgimg-".$i." w3-display-container w3-opacity-min'>";
+		echo "<div class='w3-display-middle'>";
+		echo "<span class='w3-xxlarge w3-text-white w3-wide'>".ic_strip($item->name)."</span>";
+		echo "</div>";
+		echo "</div>";
+	 }
+	 echo "<div class='w3-content w3-container w3-padding-64' id='p".$i."' lang='".$item['language']."'>";
+	 echo trim($item->contents);
+	 if($item['type']=="comments") {
+
+	 // begin htmlcommentbox.com -->
+	 echo "<div id='HCB_comment_box'>";
+?>   <a href="https://www.htmlcommentbox.com">HTML Comment Box</a> is loading comments...</div>
+	 <link rel="stylesheet" type="text/css" href="https://www.htmlcommentbox.com/static/skins/default/skin.css" />
+	 <script type="text/javascript" language="javascript" id="hcb"> /*<!--*/ if(!window.hcb_user){hcb_user={  };} (function(){s=document.createElement("script");s.setAttribute("type","text/javascript");s.setAttribute("src", "https://www.htmlcommentbox.com/jread?page="+escape((window.hcb_user && hcb_user.PAGE)||(""+window.location)).replace("+","%2B")+"&opts=470&num=10");if (typeof s!="undefined") document.getElementsByTagName("head")[0].appendChild(s);})(); /*-->*/ </script>
+	 <!-- end htmlcommentbox.com --><?php
+	  }
+	  if($item['type']=="form") {
+?>   <div>
+	 <div class="w3-half">    
+	   <form action="#alert" role="form" method="post">
+		  <p><input type="text" class="w3-input w3-border" placeholder="Name" name="name"></p>
+		  <p><input type="text" class="w3-input w3-border" placeholder="Contact Phone #" name="phone"></p>
+		  <p><input type="email" class="w3-input w3-border" placeholder="Email" name="email"></p>
+		  <p><input type="text" class="w3-input w3-border" placeholder="Message" name="message"></p>
+		  <p><button class="w3-button w3-black w3-border" type="submit" id="alert">
+			<i class="fa fa-paper-plane"></i> SEND MESSAGE
+		  </button></p>
+	   </form>
 <?php
-          if ($name!="")
-            if(sendDb($name,$phone,$email,$message)) {
-               echo "<div class='w3-panel w3-green' id='alert'>";
-               echo "<b>Contact information submitted.  We will contact you as soon as possible.</b>";
-               echo "</div>";
-            } else {
-               echo "<div class='w3-panel w3-blue' id='alert'>";
-               echo "<b>Missing Name or Contact Info.</b>";
-               echo "</div>";
-            }?>
-         </div>
-         </div><?php
-     }
+		  if ($name!="")
+			if(sendDb($name,$phone,$email,$message)) {
+			   echo "<div class='w3-panel w3-green' id='alert'>";
+			   echo "<b>Contact information submitted.  We will contact you as soon as possible.</b>";
+			   echo "</div>";
+			} else {
+			   echo "<div class='w3-panel w3-blue' id='alert'>";
+			   echo "<b>Missing Name or Contact Info.</b>";
+			   echo "</div>";
+			}
+	  }    ?>
+	 </div>
+	 </div><?php
      echo "</div>";
    }
-   }
 ?>
 
 <!-- Footer -->