diff --git a/public_html/gmap.html b/public_html/gmap.html
index 7146590..016503f 100644
--- a/public_html/gmap.html
+++ b/public_html/gmap.html
@@ -115,7 +115,7 @@
                                         <a href="http://www.airframes.org/" onclick="document.getElementById('horrible_hack').submit.call(document.getElementById('airframes_post')); return false;">
                                           <span id="selected_icao"></span>
                                         </a>
- 										<span id="selected_icaoflag"></span>
+ 					<span id="selected_flag"></span>
                                         <span id="selected_registration"></span>
                                         <span id="selected_icaotype"></span>
                                         <span id="selected_emergency"></span>
@@ -144,7 +144,7 @@
 
                                     <tr class="infoblock_body">
                                       <td colspan=1>Position: <span id="selected_position">n/a</span></td>
-                                      <td>Country: <span id="selected_flag">n/a</span><span id="selected_country">n/a</span></td>
+                                      <td>Country: <span id="selected_country">n/a</span></td>
                                     </tr>
 
                                     <tr class="infoblock_body">
@@ -155,8 +155,7 @@
 				<div id="planes_table">
 	                          <table id="tableinfo" width="100%">
 	                            <thead style="background-color: #BBBBBB; cursor: pointer;">
-	                              <td colspan="2" id="icao" onclick="sortByICAO();">ICAO
-	                         		<span id="flag"></span></td>
+	                              <td colspan="2" id="icao" onclick="sortByICAO();">ICAO <span id="flag"></span></td>
 	                              <td id="flight" onclick="sortByFlight();">Flight</td>
 	                              <td id="squawk" onclick="sortBySquawk();" align="right">Squawk</td>
                                       <td id="altitude" onclick="sortByAltitude();" align="right">Altitude</td>
@@ -169,8 +168,7 @@
                                     <tbody>
                                       <tr id="plane_row_template" class="plane_table_row hidden">
                                         <td>ICAO</td>
-                                        <td align="center">COUNTRY</td>
-                                        <td>FLIGHT</td>
+                                      	<td>FLIGHT</td>
                                         <td align="right">SQUAWK</td>
                                         <td align="right">ALTITUDE</td>
                                         <td align="right">SPEED</td>