diff --git a/.gitignore b/.gitignore
index e106a1b4..d383a8c5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .htaccess
 *.log
-.DS_STORE
\ No newline at end of file
+.DS_STORE
+.idea/
\ No newline at end of file
diff --git a/includes/shortcodes/class-sp-shortcode-staff.php b/includes/shortcodes/class-sp-shortcode-staff.php
index 33db0a99..743bd0cf 100644
--- a/includes/shortcodes/class-sp-shortcode-staff.php
+++ b/includes/shortcodes/class-sp-shortcode-staff.php
@@ -19,7 +19,10 @@ class SP_Shortcode_Staff {
 		if ( ! isset( $atts['id'] ) && isset( $atts[0] ) && is_numeric( $atts[0] ) )
 			$atts['id'] = $atts[0];
 
-		sp_get_template( 'staff-photo.php', $atts );
+		sp_get_template( 'staff-header.php',  $atts );
+		sp_get_template( 'staff-photo.php',   $atts );
 		sp_get_template( 'staff-details.php', $atts );
+		sp_get_template( 'staff-excerpt.php', $atts );
+		sp_get_template( 'staff-content.php', $atts );
 	}
 }
diff --git a/templates/staff-content.php b/templates/staff-content.php
new file mode 100644
index 00000000..5407acf1
--- /dev/null
+++ b/templates/staff-content.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Staff Content
+ *
+ * @author 		ThemeBoy
+ * @package 	SportsPress/Templates
+ */
+
+if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( get_option( 'sportspress_staff_show_content', 'yes' ) === 'no' ) return;
+
+if ( ! isset( $id ) )
+    $id = get_the_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>
+    <?php
+}
\ No newline at end of file
diff --git a/templates/staff-excerpt.php b/templates/staff-excerpt.php
new file mode 100644
index 00000000..416045e8
--- /dev/null
+++ b/templates/staff-excerpt.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Staff Excerpt
+ *
+ * @author 		ThemeBoy
+ * @package 	SportsPress/Templates
+ */
+
+if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+if ( get_option( 'sportspress_staff_show_excerpt', 'yes' ) === 'no' ) return;
+
+if ( ! isset( $id ) )
+    $id = get_the_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
+}
\ No newline at end of file
diff --git a/templates/staff-header.php b/templates/staff-header.php
new file mode 100644
index 00000000..33b2b4b8
--- /dev/null
+++ b/templates/staff-header.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * Staff Header
+ *
+ * @author 		ThemeBoy
+ * @package 	SportsPress/Templates
+ */
+
+if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly
+
+if ( ! isset( $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
+}
\ No newline at end of file