Index: trunk/extras/my_themes/header.php
===================================================================
--- trunk/extras/my_themes/header.php	(revision 642)
+++ trunk/extras/my_themes/header.php	(revision 646)
@@ -28,40 +28,42 @@
 <div id="xpress_page">
 	<div id="xpress-header-bar">
-<div id="xpress_header" role="banner">
+		<!-- <div id="xpress_header" role="banner"> -->
+		<div id="xpress_header">
 			<div id="xpress-header-bar-top">
-			<div class="xpress-header-title">
-				<?php  if (xpress_selected_author_id('echo=0') && function_exists('get_avatar')) echo get_avatar(xpress_selected_author_id('echo=0'),$size = '32'); ?>
-				<a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a>
-			</div>
-			<div class="xpress-conditional-title">
-				&nbsp; <?php xpress_conditional_title();?> 
-			</div>
-			<div class="xpress-description">
-				<?php bloginfo('description'); ?>
-			</div>
-		</div>
+				<div class="xpress-header-title">
+					<?php  if (xpress_selected_author_id('echo=0') && function_exists('get_avatar')) echo get_avatar(xpress_selected_author_id('echo=0'),$size = '32'); ?>
+					<a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a>
+				</div>
+				<div class="xpress-conditional-title">
+					&nbsp; <?php xpress_conditional_title();?> 
+				</div>
+				<div class="xpress-description">
+					<?php bloginfo('description'); ?>
+				</div>
+			</div><!-- #xpress-header-bar-top -->
 	
-		<div id="menu_div">
-			<div id="access">
-				<?php if (function_exists('wp_nav_menu')) wp_nav_menu( array( 'sort_column' => 'menu_order', 'container_class' => 'menu-aheader' ) ); ?> 
-			</div><!-- #access -->
-			<div id="xpress-menu">
-				<div class="menu-header">
-					<div class="menu">
-						<ul>
-							<?php
-								if(xpress_is_multiblog()){
-									$blog_details = get_blog_details(1);
-									$site_url = $blog_details->siteurl;
-									echo '<li><a href="' . $site_url . '/">' . __('Main Page','xpress') . '</a></li>';
-								}
-							?>
-							<li><a href="<?php echo get_option('home'); ?>/"><?php _e('Blogs Home','xpress')?></a></li>
-							<?php if(xpress_is_contributor()) { echo '<li>'. xpress_post_new_link('link_title='. __('Post New','xpress'). '&echo=0').'</li>'; }?>
-						</ul>
-					</div><!-- #menu -->
-				</div><!-- #menu-header -->
-			</div><!-- #xpress-menu -->
-		</div><!-- #menu_div -->
+			<!-- <div id="menu_div" role="navigation"> -->
+			<div id="menu_div">
+				<div id="access">
+					<?php if (function_exists('wp_nav_menu')) wp_nav_menu( array( 'sort_column' => 'menu_order', 'container_class' => 'menu-aheader' ) ); ?> 
+				</div><!-- #access -->
+				<div id="xpress-menu">
+					<div class="menu-header">
+						<div class="menu">
+							<ul>
+								<?php
+									if(xpress_is_multiblog()){
+										$blog_details = get_blog_details(1);
+										$site_url = $blog_details->siteurl;
+										echo '<li><a href="' . $site_url . '/">' . __('Main Page','xpress') . '</a></li>';
+									}
+								?>
+								<li><a href="<?php echo get_option('home'); ?>/"><?php _e('Blogs Home','xpress')?></a></li>
+								<?php if(xpress_is_contributor()) { echo '<li>'. xpress_post_new_link('link_title='. __('Post New','xpress'). '&echo=0').'</li>'; }?>
+							</ul>
+						</div><!-- #menu -->
+					</div><!-- #menu-header -->
+				</div><!-- #xpress-menu -->
+			</div><!-- #menu_div -->
+		</div><!-- #xpress_header -->
 	</div><!-- #xpress-header-bar -->
-	</div><!-- #xpress-header-bar -->
Index: trunk/extras/my_themes/sidebar-footer.php
===================================================================
--- trunk/extras/my_themes/sidebar-footer.php	(revision 642)
+++ trunk/extras/my_themes/sidebar-footer.php	(revision 646)
@@ -6,5 +6,6 @@
 	$side_bar_num = get_option('xpress_footer_sidebars_count');
 	if (empty($side_bar_num)) return;
-	echo "<div id=\"footer-widget-area\" role=\"complementary\">\n";
+//	echo "<div id=\"footer-widget-area\" role=\"complementary\">\n";
+	echo "<div id=\"footer-widget-area\">\n";
 	for($i=1;$i <= $side_bar_num;$i++){
 		$sidebar_id = 'footer-widget-area-'.$i;
