diff --git a/b2-include/b2template.functions.php b/b2-include/b2template.functions.php
index f1a59c03ee..5427d38d18 100644
--- a/b2-include/b2template.functions.php
+++ b/b2-include/b2template.functions.php
@@ -359,13 +359,13 @@ function print_UrlPopNav() {
                    array('http://mapserver.maptech.com/api/espn/index.cfm?lat='.get_Lat().'&lon='.get_Lon().'&scale=100000&zoom=50&type=1&icon=0&&scriptfile=http://mapserver.maptech.com/api/espn/index.cfm',
                          'Maptech near here')
                   );
-    echo '<form name="form">
+    echo '<form action=""><div>
 <select name="site" size="1" onchange="formHandler(this.form);" >'."\n";
-    echo '<option value=".">Sites referencing '.get_Lat().' x '.get_Lon()."\n";
+    echo '<option value=".">Sites referencing '.get_Lat().' x '.get_Lon()."</option>\n";
     foreach($sites as $site) {
         echo "\t".'<option value="'.$site[0].'">'.$site[1]."</option>\n";
     }
-    echo '</select>
+    echo '</select></div>
 </form>'."\n";
 }
 
diff --git a/index.php b/index.php
index dae374342b..73012ba960 100644
--- a/index.php
+++ b/index.php
@@ -18,7 +18,7 @@ require_once($abspath.'wp-links/links.php');
 		doGeoUrlHeader($posts);
 	} ?>
 	<style type="text/css" media="screen">
-		@import url( <?php echo $siteurl; ?>/layout2b.css );
+		@import url( <?php echo $siteurl; ?>/wp-layout.css );
 	</style>
 	
 	<link rel="stylesheet" type="text/css" media="print" href="<?php echo $siteurl; ?>/print.css" />
@@ -42,16 +42,15 @@ require_once($abspath.'wp-links/links.php');
 
  <h3 class="storytitle" id="post-<?php the_ID(); ?>">
   <a href="<?php permalink_link() ?>" rel="bookmark"><?php the_title(); ?></a>
-  <span class="meta"><a href="?cat=<?php the_category_ID() ?>" title="Category: <?php the_category() ?>">[<?php the_category() ?>]</a> &#8212; <?php the_author() ?> @ <?php the_time() ?><br />
-<?php
-    if(get_settings('use_geo_positions')) {
-        if((get_Lon() != null) && (get_Lon() < 360) &&(get_Lon() > -360)) {  ?>
-    from: &nbsp;<?php print_Lat(); echo " x "; print_Lon(); echo "&nbsp;&nbsp;"; print_UrlPopNav(); ?>
-<?php
-        }
-    } ?>
-  </span>
+  <span class="meta"><a href="?cat=<?php the_category_ID() ?>" title="Category: <?php the_category() ?>">[<?php the_category() ?>]</a> &#8212; <?php the_author() ?> @ <?php the_time() ?> 
+  <?php if(get_settings('use_geo_positions')) { if((get_Lon() != null) && (get_Lon() < 360) &&(get_Lon() > -360)) {  ?>
+		&#8212; Posted from: <?php print_Lat(); ?> &#215; <?php print_Lon(); ?>
+<?php  } } ?>
+		</span>
  </h3>
+<?php if(get_settings('use_geo_positions')) { if((get_Lon() != null) && (get_Lon() < 360) &&(get_Lon() > -360)) {  ?>
+    	 <?php print_UrlPopNav(); ?>
+<?php } } ?>
 
 <div class="storycontent">
 	<?php the_content(); ?>