Index: trunk/wp-content/themes/xpress_default/single.php
===================================================================
--- trunk/wp-content/themes/xpress_default/single.php	(revision 141)
+++ trunk/wp-content/themes/xpress_default/single.php	(revision 143)
@@ -9,5 +9,5 @@
 	}	
 ?>
-		<div class="xpress-header-bar">
+		<div id="xpress-header-bar">
 			<div class="xpress-header-title">
 				<a href="<?php echo get_option('home'); ?>/"><?php bloginfo('name'); ?></a>
@@ -34,55 +34,34 @@
 
 		<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-header">
+				<?php if (function_exists('hotDates')) { hotDates(); }?>
+				<div class ="xpress-post-title">
+					<h3><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>'); ?>
-
-				<?php wp_link_pages(array('before' => '<p><strong>' . __('Pages:', 'xpress') . '</strong> ', 'after' => '</p>', 'next_or_number' => 'number')); ?>
-				<?php echo '<p class="postmeta">' ;/* _e('Posted:', 'xpress'); echo '&nbsp;'; the_author_posts_link(); echo '<br />' ; */?><?php if(function_exists('the_tags')) : ?><?php the_tags(__('Tags:', 'xpress') . ' ', ', ', '<br />'); ?><?php endif; ?><?php printf(__('Posted in %s', 'xpress'), get_the_category_list(' &bull; ') . '</p>'); ?>
-				
-				<p class="postmetadata alt">
-					<small>
-						<?php /* This is commented, because it requires a little adjusting sometimes.
-							You'll need to download this plugin, and follow the instructions:
-							http://binarybonsai.com/archives/2004/08/17/time-since-plugin/ */
-							/* $entry_datetime = abs(strtotime($post->post_date) - (60*120)); $time_since = sprintf(__('%s ago', 'xpress'), time_since($entry_datetime)); */ ?>
-						<?php printf(__('This entry was posted %1$s on %2$s at %3$s and is filed under %4$s.', 'xpress'), $time_since, get_the_time(__('l, F jS, Y', 'xpress')), get_the_time(), get_the_category_list(' &bull; ')); ?>
-						<?php if (function_exists('get_post_comments_feed_link')) : ?>
-						<?php printf(__("You can follow any responses to this entry through the <a href='%s'>RSS 2.0</a> feed.", "xpress"), get_post_comments_feed_link()); ?> 
-                        <?php else : ?>
-						<?php _e('You can follow any responses to this entry through the', 'xpress'); ?><?php comments_rss_link('RSS 2.0'); ?><?php _e('feed.', 'xpress'); ?>
-						<?php endif; ?>
-
-						<?php if (('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
-							// Both Comments and Pings are open ?>
-							<?php printf(__('You can <a href="#respond">leave a response</a>, or <a href="%s" rel="trackback">trackback</a> from your own site.', 'xpress'), trackback_url(false)); ?>
-
-						<?php } elseif (!('open' == $post-> comment_status) && ('open' == $post->ping_status)) {
-							// Only Pings are Open ?>
-							<?php printf(__('Responses are currently closed, but you can <a href="%s" rel="trackback">trackback</a> from your own site.', 'xpress'), trackback_url(false)); ?>
-
-						<?php } elseif (('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
-							// Comments are open, Pings are not ?>
-							<?php _e('You can skip to the end and leave a response. Pinging is currently not allowed.', 'xpress'); ?>
-
-						<?php } elseif (!('open' == $post-> comment_status) && !('open' == $post->ping_status)) {
-							// Neither Comments, nor Pings are open ?>
-							<?php _e('Both comments and pings are currently closed.', 'xpress'); ?>
-
-						<?php } edit_post_link(__('Edit this entry', 'xpress'),'','.'); ?>
-
-					</small>
-				</p>
-
+			</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 class ="xpress-comments-block">
+				<?php comments_template(); ?>	
 			</div>
 		</div>
 
-	<?php comments_template(); ?>
+	
 
 	<?php endwhile; else: ?>