diff --git a/functions/classes.php b/functions/classes.php
index c4d70b1..8a2f522 100644
--- a/functions/classes.php
+++ b/functions/classes.php
@@ -99,35 +99,33 @@ function comicpress_post_class($classes = '') {
 	$classes[] = 'uentry';
 	
 	/* if a comic category */
-	if (in_comic_category()) $classes[] = 'comicpost';
-	if (is_page()) $classes[] = 'pagepost';
-	if (!in_comic_category() && !is_page()) $classes[] = 'blogpost';
+	if (in_comic_category()) $classes[] = 'post-comic';
+	if (is_page()) $classes[] = 'post-page';
+	if (!in_comic_category() && !is_page()) $classes[] = 'post-blog';
 	
 
 	/* Post alt class. */
-	if (!is_page()) {
-		$classes[] = 'postonpage-' . ++$post_alt;
-		
-		if ( $post_alt % 2 )
-			$classes[] = 'odd';
-		else
-			$classes[] = 'even';
-		
-		/* Sticky class (only on home/blog page). */
-		if( is_sticky() && is_home() )
-			$classes[] = 'sticky';
-		
-		/* Author class. */
-		if ( !is_attachment() )
-			$classes[] = 'post-author-' . sanitize_html_class( get_the_author_meta( 'user_nicename' ), get_the_author_meta( 'ID' ) );
-		
-		/* User-created classes. */
-		if ( !empty( $class ) ) :
-			if ( !is_array( $class ) )
-				$class = preg_split( '#\s+#', $class );
-			$classes = array_merge( $classes, $class );
-		endif;
-	}
+	$classes[] = 'postonpage-' . ++$post_alt;
+	
+	if ( $post_alt % 2 )
+		$classes[] = 'odd';
+	else
+		$classes[] = 'even';
+	
+	/* Sticky class (only on home/blog page). */
+	if( is_sticky() && is_home() )
+		$classes[] = 'sticky';
+	
+	/* Author class. */
+	if ( !is_attachment() )
+		$classes[] = 'post-author-' . sanitize_html_class( get_the_author_meta( 'user_nicename' ), get_the_author_meta( 'ID' ) );
+	
+	/* User-created classes. */
+	if ( !empty( $class ) ) :
+		if ( !is_array( $class ) )
+			$class = preg_split( '#\s+#', $class );
+		$classes = array_merge( $classes, $class );
+	endif;
 
 	/* Password-protected posts. */
 	if ( post_password_required() )
diff --git a/functions/displaypost.php b/functions/displaypost.php
index 3b6e29f..eefcd79 100644
--- a/functions/displaypost.php
+++ b/functions/displaypost.php
@@ -141,9 +141,9 @@ function comicpress_display_the_content() {
 
 function comicpress_display_post() {
 	global $post, $wp_query; ?>
+	<?php comicpress_display_blog_navigation(); ?>
+	<?php comicpress_display_comic_navigation(); ?>
 	<div <?php post_class(); ?>>
-		<?php comicpress_display_blog_navigation(); ?>
-		<?php comicpress_display_comic_navigation(); ?>
 		<?php comicpress_display_post_thumbnail(); ?>
 		<div class="post-head"></div>
 			<div class="post-content">
@@ -169,12 +169,12 @@ function comicpress_display_post() {
 					<br class="clear-margins" />
 				</div>
 				<?php wp_link_pages(array('before' => '<div class="linkpages"><span class="linkpages-pagetext">'.__('Pages:','comicpress').'</span> ', 'after' => '</div>', 'next_or_number' => 'number'));  ?>
-			</div>
-			<div class="post-extras">
-				<?php comicpress_display_post_tags(); ?>
-				<?php comicpress_display_comment_link(); ?>
-				<div class="clear"></div>
-				<?php comicpress_display_related_posts(); ?>
+				<div class="post-extras">
+					<?php comicpress_display_post_tags(); ?>
+					<?php comicpress_display_comment_link(); ?>
+					<div class="clear"></div>
+					<?php comicpress_display_related_posts(); ?>
+				</div>
 			</div>
 			<?php if (is_page()) { edit_post_link(__('Edit this page.','comicpress'), '<p>', '</p>'); } ?>
 		<div class="post-foot"></div>
diff --git a/style.css b/style.css
index 890f953..844cdff 100644
--- a/style.css
+++ b/style.css
@@ -477,10 +477,15 @@ h4, h4 a {
 .post {
 	clear: both;
 	text-align: left;
+	padding: 2px;
+	margin-bottom: 20px;
+}
+
+.post-content {
+	padding: 3px;
 }
 
 .post-foot {
-	margin-bottom: 40px;
 }
 
 .post-image {