Index: trunk/wp-content/themes/xpress_default/comments.php
===================================================================
--- trunk/wp-content/themes/xpress_default/comments.php	(revision 165)
+++ trunk/wp-content/themes/xpress_default/comments.php	(revision 168)
@@ -36,5 +36,4 @@
 <?php if ('open' == $post->comment_status) : ?>
 	<div id="xpress-respond">
-
 		<h3><?php comment_form_title( __('Leave a Reply', 'xpress'), __('Leave a Reply for %s' , 'xpress') ); ?></h3>
 	</div>
@@ -42,11 +41,11 @@
 	<div id="cancel-comment-reply"> 
 		<small><?php cancel_comment_reply_link() ?></small>
-		</div> 
+	</div> 
 	
-		<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
-			<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p>
-		<?php else : ?>
+	<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
+		<p><?php printf(__('You must be <a href="%s">logged in</a> to post a comment.', 'xpress'), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink())); ?></p>
+	<?php else : ?>
+		<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 			<div id="xpress-comment-user">
-				<form action="<?php echo get_option('siteurl'); ?>/wp-comments-post.php" method="post" id="commentform">
 				<?php if ( $user_ID ) : ?>
 					<p><?php printf(__('Logged in as <a href="%1$s">%2$s</a>.', 'xpress'), get_option('siteurl') . '/wp-admin/profile.php', $user_identity); ?> <a href="<?php echo wp_logout_url(get_permalink()); ?>" title="<?php _e('Log out of this account', 'xpress'); ?>"><?php _e('Log out &raquo;', 'xpress'); ?></a></p>
@@ -72,8 +71,7 @@
 				<?php comment_id_fields(); ?> 	
 				<?php do_action('comment_form', $post->ID); ?>
-				</form>
 			</div>
-		<?php endif; // If registration required and not logged in ?>
-	</div>
+		</form>
+	<?php endif; // If registration required and not logged in ?>
 
 <?php endif; // if you delete this the sky will fall on your head ?>
Index: trunk/wp-content/themes/xpress_default/single.php
===================================================================
--- trunk/wp-content/themes/xpress_default/single.php	(revision 165)
+++ trunk/wp-content/themes/xpress_default/single.php	(revision 168)
@@ -1,72 +1,84 @@
 <?php get_header(); ?>
 
+<div id="xpress_wrap">				
+	<?php
+		if(xpress_is_theme_sidebar_disp()) {
+			echo '<div id="xpress_content" class="narrowcolumn">';	
+		} else {
+			echo '<div id="xpress_content" class="narrowcolumn_nonside">';
+		}	
+	?>				
+		<?php if (have_posts()) : ?>
 				
-<div id="xpress_wrap">
-<?php
-if(xpress_is_theme_sidebar_disp()) {
-	echo '<div id="xpress_content" class="narrowcolumn">';	
-} else {
-	echo '<div id="xpress_content" class="narrowcolumn_nonside">';
-}	
-?>
-<?php if (have_posts()) : while (have_posts()) : the_post(); ?>
-		<div class="xpress-navi-bar">
-			<div class="alignleft"><?php xpress_left_arrow_post_link(true) ?></div>
-			<div class="alignright"><?php xpress_right_arrow_post_link(true) ?></div>
-		</div>
-	
-		<div class="xpress-post" id="post-<?php the_ID(); ?>">
-			<div class ="xpress-post-header">
-				<?php if (function_exists('hotDates')) { hotDates(); }?>
-				<div class ="xpress-post-title">
-					<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2>
+			<?php while (have_posts()) : the_post(); ?>
+				<div class="xpress-navi-bar">
+					<div class="alignleft"><?php xpress_left_arrow_post_link(true); ?></div>
+					<div class="alignright"><?php xpress_right_arrow_post_link(true); ?></div>
 				</div>
-			</div>
 
-			<div class="xpress-post-entry">
-				<?php the_content('<p class="serif">' . __('Read the rest of this entry &raquo;', 'xpress') . '</p>'); ?>
-			</div>
-
-			<div class="xpress-link-pages"><?php wp_link_pages() ?></div>
-
-			<div class ="xpress-post-footer">
-				<?php
-					the_time('Y/m/d l');
-					echo ' - ';
-					the_author_posts_link();
-					echo ' (' . xpress_post_views_count($post->ID,__('Views :%d', 'xpress'),false) . ')'; 
-					echo ' | ';
-					// echo the_tags(__('Tags:', 'xpress') . ' ', ', ', ' | ');
-					printf(__('Posted in %s', 'xpress'), get_the_category_list(', '));
-					echo ' | ';
-					edit_post_link(__('Edit', 'xpress'), '', ' | ');
-					comments_popup_link(__('No Comments &#187;', 'xpress'), __('1 Comment &#187;', 'xpress'), __('% Comments &#187;', 'xpress'), '', __('Comments Closed', 'xpress') );
-				?>
-			</div>
-					
-			<div id ="xpress-pings-block">
-				<h3><?php xpress_pings_number(__('No Trackback/Pingback', 'xpress'),__('One Trackback/Pingback', 'xpress'),__('% TrackBack/Pingback', 'xpress')) ?></h3>
-	
-				<?php xpress_pings_list(true) ?>
-			</div>
-					
-			<div id ="xpress-comments-block">
-				<?php comments_template('', true); ?>
-			</div>
+				<div class="xpress-post" id="post-<?php the_ID(); ?>">
+					<div class ="xpress-post-header">
+						<?php if (function_exists('hotDates')) { hotDates(); }?>
+						<div class ="xpress-post-title">
+							<h2><a href="<?php the_permalink() ?>" rel="bookmark" title="<?php printf(__('Permanent Link to %s', 'xpress'), the_title_attribute('echo=0')); ?>"><?php the_title(); ?></a></h2>
+						</div>
+					</div>
+							
+					<div class="xpress-post-entry">
+						<?php the_content('<p class="serif">' . __('Read the rest of this entry &raquo;', 'xpress') . '</p>'); ?>
+					</div>
+							
+					<div class="xpress-link-pages"><?php wp_link_pages() ?></div>
+						
+					<div class ="xpress-post-footer">
+						<?php
+							the_time('Y/m/d l');
+							echo ' - ';
+							the_author_posts_link();
+							echo ' (' . xpress_post_views_count($post->ID,__('Views :%d', 'xpress'),false) . ')'; 
+							echo ' | ';
+							// echo the_tags(__('Tags:', 'xpress') . ' ', ', ', ' | ');
+							printf(__('Posted in %s', 'xpress'), get_the_category_list(', '));
+							echo ' | ';
+							edit_post_link(__('Edit', 'xpress'), '', ' | ');
+							comments_popup_link(__('No Comments &#187;', 'xpress'), __('1 Comment &#187;', 'xpress'), __('% Comments &#187;', 'xpress'), '', __('Comments Closed', 'xpress') );
+						?>
+					</div>
+							
+					<div id ="xpress-pings-block">
+						<h3><?php xpress_pings_number(__('No Trackback/Pingback', 'xpress'),__('One Trackback/Pingback', 'xpress'),__('% TrackBack/Pingback', 'xpress')) ?></h3>
+			
+						<?php xpress_pings_list(true) ?>
+					</div>
+							
+					<div id ="xpress-comments-block">
+						<?php comments_template('', true); ?>
+					</div>
+				</div>
+				
+				<div class="xpress-navi-bar">
+					<div class="alignleft"><?php xpress_left_arrow_post_link(true) ?></div>
+					<div class="alignright"><?php xpress_right_arrow_post_link(true) ?></div>
+				</div>
 
 
-		</div>
+			<?php endwhile; ?>
+				
+			<div class="xpress-navi-bar">
+				<?php if(function_exists('wp_pagenavi')) : ?>			
+					<div class="xpress_pagenavi"><?php wp_pagenavi(); ?></div>
+				<?php else : ?>
+					<div class="alignleft"><?php xpress_left_arrow_posts_link(true); ?></div>
+					<div class="alignright"><?php xpress_right_arrow_posts_link(true); ?></div>
+				<?php endif; ?>
+			</div>
+				
+		<?php else : ?>
+			<p><?php _e('Sorry, no posts matched your criteria.', 'xpress'); ?></p>
+		<?php endif; ?>
+	</div>
+</div>
+<?php if(xpress_is_theme_sidebar_disp()) get_sidebar(); ?>
 
-		<div class="xpress-navi-bar">
-			<div class="alignleft"><?php xpress_left_arrow_post_link(true) ?></div>
-			<div class="alignright"><?php xpress_right_arrow_post_link(true) ?></div>
-		</div>
-<?php endwhile; else: ?>
-		<p><?php _e('Sorry, no posts matched your criteria.', 'xpress'); ?></p>
-<?php endif; ?>
-	
-	</div>
-</div>		
-<?php if(xpress_is_theme_sidebar_disp()) get_sidebar(); ?>
-		
 <?php get_footer(); ?>
+