diff --git a/templates/staff-content.php b/templates/staff-content.php
index 5407acf1..7ce0b30a 100644
--- a/templates/staff-content.php
+++ b/templates/staff-content.php
@@ -15,9 +15,9 @@ if ( ! isset( $id ) )
 $post = get_post( $id );
 $content = $post->post_content;
 if ( $content ) {
-    ?>
-    <div class="sp-template sp-section-staff-content sp-template-content">
-        <div class="sp-content"><?php echo apply_filters( 'the_content', $content ); ?></div>
+  ?>
+    <div class="sp-post-content">
+      <?php echo apply_filters( 'the_content', $content ); ?>
     </div>
-    <?php
+  <?php
 }
\ No newline at end of file
diff --git a/templates/staff-excerpt.php b/templates/staff-excerpt.php
index 416045e8..0b77bdde 100644
--- a/templates/staff-excerpt.php
+++ b/templates/staff-excerpt.php
@@ -15,9 +15,9 @@ if ( ! isset( $id ) )
 $post = get_post( $id );
 $excerpt = $post->post_excerpt;
 if ( $excerpt ) {
-    ?>
-    <div class="sp-template sp-section-staff-excerpt sp-template-excerpt">
-        <p class="sp-excerpt"><?php echo $excerpt; ?></p>
-    </div>
-    <?php
+  ?>
+    <p class="sp-excerpt">
+      <?php echo $excerpt; ?>
+    </p>
+  <?php
 }
\ No newline at end of file
diff --git a/templates/staff-header.php b/templates/staff-header.php
index 33b2b4b8..981a877d 100644
--- a/templates/staff-header.php
+++ b/templates/staff-header.php
@@ -9,20 +9,16 @@
 if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
 
 if ( ! isset( $id ) )
-    $id = get_the_ID();
+  $id = get_the_ID();
 
 $post = get_post( $id );
 $title = $post->post_title;
 if ( $title ) {
-
-    $staff = new SP_Staff( $id );
-    $role  = $staff->role();
-    if ( $role )
-        $title = '<strong class="sp-staff-role">' . $role->name . '</strong> ' . $title;
-
-    ?>
-    <div class="sp-template sp-template-staff-header sp-template-header">
-        <h3 class="sp-item-title"><?php echo $title ?></h3>
-    </div>
-    <?php
+  $staff = new SP_Staff( $id );
+  $role  = $staff->role();
+  if ( $role )
+    $title = '<strong class="sp-staff-role">' . $role->name . '</strong> ' . $title;
+  ?>
+    <h3 class="sp-staff-name"><?php echo $title ?></h3>
+  <?php
 }
\ No newline at end of file