diff --git a/404.php b/404.php
index 2a75ece..1bea19c 100644
--- a/404.php
+++ b/404.php
@@ -6,7 +6,7 @@
   )
 );
 
-jf_get_main_template_part( 
+jf_get_main_template_part_single( 
   array(
   'templates/content/404',
   )
diff --git a/archive.php b/archive.php
index db2b635..6536e98 100644
--- a/archive.php
+++ b/archive.php
@@ -6,15 +6,15 @@
   )
 );
 
-jf_get_main_template_part( 
+jf_get_main_template_part_archive( 
   array(
   'templates/content/archive',
   'templates/snippets/pager'
   )
 );
 
-jf_get_sidebar_template_part( 
+jf_get_sidebar_template_part(
   array(
 
   )
-);
\ No newline at end of file
+);
diff --git a/functions/jf-base.php b/functions/jf-base.php
index 996e32e..196706c 100644
--- a/functions/jf-base.php
+++ b/functions/jf-base.php
@@ -51,7 +51,7 @@ function jf_get_main_header_template_part( $templates ) {
   }
 }
 
-function jf_get_main_template_part( $templates ){
+function jf_get_main_template_part_single( $templates ){
   print '<article class="content">';
   foreach ( $templates as $template ) {
     get_template_part( $template );
@@ -59,6 +59,14 @@ function jf_get_main_template_part( $templates ){
   print '</article>';
 }
 
+function jf_get_main_template_part_archive( $templates ){
+  print '<section class="content">';
+  foreach ( $templates as $template ) {
+    get_template_part( $template );
+  }
+  print '</section>';
+}
+
 function jf_get_sidebar_template_part( $templates ){
   if( !empty($templates) ) {
     print '<aside class="sidebar">';
@@ -72,7 +80,7 @@ function jf_get_sidebar_template_part( $templates ){
 
 // Enqueue all Stylesheets and Javascript files
 function jf_enqueue_scripts_styles() {
-  if( ENVIRONMENT == 'prod' ) { 
+  if( ENVIRONMENT == 'prod' ) {
     wp_enqueue_style( 'style-min', get_template_directory_uri() .'/assets/css/style.min.css', false );
   } else {
     wp_enqueue_style( 'style', get_template_directory_uri() .'/assets/css/style.css', false );
@@ -142,4 +150,4 @@ function rm_generator_filter() {
 
 
 // Load translation files || Read more about this in /lang/readme.txt
-load_theme_textdomain('jumpingfrog', get_template_directory() .'/lang' );
\ No newline at end of file
+load_theme_textdomain('jumpingfrog', get_template_directory() .'/lang' );
diff --git a/index.php b/index.php
index 0dd04b7..daa5f3f 100644
--- a/index.php
+++ b/index.php
@@ -6,7 +6,7 @@
   )
 );
 
-jf_get_main_template_part( 
+jf_get_main_template_part_single( 
   array(
   'templates/content/page'
   )
diff --git a/page.php b/page.php
index 0dd04b7..daa5f3f 100644
--- a/page.php
+++ b/page.php
@@ -6,7 +6,7 @@
   )
 );
 
-jf_get_main_template_part( 
+jf_get_main_template_part_single( 
   array(
   'templates/content/page'
   )
diff --git a/templates/content/archive.php b/templates/content/archive.php
index cbdaa4b..6363cf0 100644
--- a/templates/content/archive.php
+++ b/templates/content/archive.php
@@ -1,9 +1,9 @@
-<?php 
+<?php
   if (have_posts()) :
     while (have_posts()) : the_post(); ?>
-    <div id="post-<?php the_ID(); ?>" <?php post_class() ?>>
+    <article <?php post_class() ?>>
       <?php jf_read_more_excerpt(); ?>
-    </div>
+    </article>
   <?php
     endwhile;
-  endif;
\ No newline at end of file
+  endif;
diff --git a/templates/content/page.php b/templates/content/page.php
index 8bc3b0d..769333e 100644
--- a/templates/content/page.php
+++ b/templates/content/page.php
@@ -1,7 +1,7 @@
-<?php 
+<?php
   if (have_posts()) :
     while (have_posts()) : the_post(); ?>
-    <div id="post-<?php the_ID(); ?>" <?php post_class() ?>>
+    <div <?php post_class() ?>>
 	    <?php the_content(); ?>
 	  </div>
 	<?php