diff --git a/includes/shortcodes.php b/includes/shortcodes.php
index e64dea3..a91dd68 100755
--- a/includes/shortcodes.php
+++ b/includes/shortcodes.php
@@ -540,15 +540,23 @@ function getLatestSeriesImageId( $series = 0 ) {
 		}
 
 		return null;
-	}/** @noinspection PhpUnusedParameterInspection */
-	/** @noinspection PhpUnusedParameterInspection */
+	}
 
 	/**
 	 * Renders sorting HTML.
 	 *
-	 * @param array $atts Shortcode parameters. There are 0 parameters for this shortcode.
+	 * @param array $atts       Shortcode parameters.
+	 *
+	 * @type string $series     Force specific series to show. Slug only
+	 * @type string $preachers  Force specific preacher to show. Slug only
+	 * @type string $topics     Force specific topic to show. Slug only
+	 * @type string $books      Force specific book to show. Slug only
+	 * @type string $visibility 'none' to hide the forced fields, 'disable' to show them as disabled and 'suggest' to
+	 *       just set the default value while allowing user to change it. Default 'suggest'
 	 *
 	 * @return string Sorting HTML
+     *
+     * @since 2.5.0 added shortcode parameters
 	 */
 	public function displaySermonSorting( $atts = array() ) {
 		// enqueue scripts and styles
@@ -556,7 +564,19 @@ public function displaySermonSorting( $atts = array() ) {
 			define( 'SM_ENQUEUE_SCRIPTS_STYLES', true );
 		}
 
-		return render_wpfc_sorting();
+		// default shortcode options
+		$args = array(
+			'series'     => '',
+			'preachers'  => '',
+			'topics'     => '',
+			'books'      => '',
+			'visibility' => 'suggest',
+		);
+
+		// merge default and user options
+		$args = shortcode_atts( $args, $atts, 'sermon_sort_fields' );
+
+		return render_wpfc_sorting( $args );
 	}
 
 	/**
diff --git a/includes/template-tags.php b/includes/template-tags.php
index bf43b28..920edd5 100755
--- a/includes/template-tags.php
+++ b/includes/template-tags.php
@@ -133,67 +133,92 @@ function render_wpfc_sermon_archive() {
 
 <?php }
 
-// render sermon sorting
-function render_wpfc_sorting() {
+/**
+ * Render sermon sorting
+ *
+ * @param array $args Display options. See the 'sermon_sort_fields' shortcode for array items
+ *
+ * @see   WPFC_Shortcodes->displaySermonSorting()
+ *
+ * @return string the HTML
+ *
+ * @since 2.5.0 added $args
+ */
+function render_wpfc_sorting( $args = array() ) {
+	// reset values
+	$hidden = '';
+
+	// handle current page. We don't need "page" var in URL
+	if ( is_archive() && get_post_type() === 'wpfc_sermon' ) {
+		$action = get_site_url() . '/' . generate_wpfc_slug()['slug'];
+	} else {
+		$action = '';
+	}
+
+	// we need it for taxonomy name conversion function
+	$shortcodes = new WPFC_Shortcodes();
+
+	// add other filtering fields
+	foreach ( array( 'wpfc_preacher', 'wpfc_sermon_series', 'wpfc_sermon_topics', 'wpfc_bible_book' ) as $filter ) {
+		// Force shortcode defined argument if set
+		if ( ! empty( $args[ $shortcodes->convertTaxonomyName( $filter, false ) ] ) &&
+		     $value = $args[ $shortcodes->convertTaxonomyName( $filter, false ) ] ) {
+			$hidden .= "<input type='hidden' name='$filter' value='$value'>" . PHP_EOL;
+
+			continue;
+		}
+
+		if ( ! empty( get_query_var( $filter ) ) && $value = get_query_var( $filter ) ) {
+			$hidden .= "<input type='hidden' name='$filter' value='$value'>" . PHP_EOL;
+		}
+	}
+
+	// Filters HTML fields data
+	$filters = array(
+		array(
+			'className' => 'sortPreacher',
+			'taxonomy'  => 'wpfc_preacher',
+			'title'     => 'Sort by ' . \SermonManager::getOption( 'preacher_label' ) ?: 'Preacher',
+		),
+		array(
+			'className' => 'sortSeries',
+			'taxonomy'  => 'wpfc_sermon_series',
+			'title'     => 'Sort by Series'
+		),
+		array(
+			'className' => 'sortTopics',
+			'taxonomy'  => 'wpfc_sermon_topics',
+			'title'     => 'Sort by Topic'
+		),
+		array(
+			'className' => 'sortBooks',
+			'taxonomy'  => 'wpfc_bible_book',
+			'title'     => 'Sort by Book'
+		),
+	);
+
 	ob_start(); ?>
     <div id="wpfc_sermon_sorting">
-        <span class="sortPreacher">
-            <form>
-                <select name="wpfc_preacher"
-                        title="Sort by <?php echo \SermonManager::getOption( 'preacher_label' ) ?: 'Preacher'; ?>"
-                        id="wpfc_preacher" onchange="return this.form.submit()">
-                    <option value="">
-                        Sort by <?php echo \SermonManager::getOption( 'preacher_label' ) ?: 'Preacher'; ?>
-                    </option>
-					<?php echo wpfc_get_term_dropdown( 'wpfc_preacher' ); ?>
-                </select>
-                <noscript>
-                    <div><input type="submit" value="Submit"/></div>
-                </noscript>
-            </form>
-        </span>
-        <span class="sortSeries">
-            <form>
-                <select title="Sort by Series" name="wpfc_sermon_series" id="wpfc_sermon_series"
-                        onchange="return this.form.submit()">
-                    <option value="">
-                        Sort by Series
-                    </option>
-					<?php echo wpfc_get_term_dropdown( 'wpfc_sermon_series' ); ?>
-                </select>
-                <noscript>
-                    <div><input type="submit" value="Submit"/></div>
-                </noscript>
-            </form>
-        </span>
-        <span class="sortTopics">
-            <form>
-                <select title="Sort by Topic" name="wpfc_sermon_topics" id="wpfc_sermon_topics"
-                        onchange="return this.form.submit()">
-                    <option value="">
-                        Sort by Topic
-                    </option>
-					<?php echo wpfc_get_term_dropdown( 'wpfc_sermon_topics' ); ?>
-                </select>
-                <noscript>
-                    <div><input type="submit" value="Submit"/></div>
-                </noscript>
-            </form>
-        </span>
-        <span class="sortBooks">
-            <form>
-                <select title="Sort by Book" name="wpfc_bible_book" id="wpfc_bible_book"
-                        onchange="return this.form.submit()">
-                    <option value="">
-                        Sort by Book
-                    </option>
-					<?php echo wpfc_get_term_dropdown( 'wpfc_bible_book' ); ?>
-                </select>
-                <noscript>
-                    <div><input type="submit" value="Submit"/></div>
-                </noscript>
-            </form>
-        </span>
+		<?php foreach ( $filters as $filter ): ?>
+			<?php if ( ( ! empty( $args[ $filter['taxonomy'] ] ) && $args['visibility'] !== 'none' ) || empty( $args[ $filter['taxonomy'] ] ) ): ?>
+                <span class="<?php echo $filter['className'] ?>">
+                    <form action="<?php echo $action; ?>">
+                        <select name="<?php echo $filter['taxonomy'] ?>"
+                                title="<?php echo $filter['title'] ?>"
+                                id="<?php echo $filter['taxonomy'] ?>"
+                                onchange="return this.form.submit()"
+	                        <?php echo ! empty( $args[ $filter['taxonomy'] ] ) && $args['visibility'] === 'disable' ? 'disabled' : '' ?>>
+                            <option value=""><?php echo $filter['title'] ?></option>
+	                        <?php echo wpfc_get_term_dropdown( $filter['taxonomy'], ! empty( $args[ $filter['taxonomy'] ] ) ? $args[ $filter['taxonomy'] ] : '' ); ?>
+                        </select>
+                        <noscript>
+                            <div><input type="submit" value="Submit"/></div>
+                        </noscript>
+	                    <?php echo $hidden; ?>
+                    </form>
+                </span>
+			<?php endif; ?>
+		<?php endforeach; ?>
     </div>
 	<?php
 	return ob_get_clean();
@@ -363,8 +388,8 @@ function wpfc_sermon_audio() {
 // render additional files
 function wpfc_sermon_attachments() {
 	global $post;
-	$html        = '<div id="wpfc-attachments" class="cf">';
-	$html        .= '<p><strong>' . __( 'Download Files', 'sermon-manager' ) . '</strong>';
+	$html = '<div id="wpfc-attachments" class="cf">';
+	$html .= '<p><strong>' . __( 'Download Files', 'sermon-manager' ) . '</strong>';
 	if ( get_wpfc_sermon_meta( 'sermon_audio' ) ) {
 		$html .= '<a href="' . get_wpfc_sermon_meta( 'sermon_audio' ) . '" class="sermon-attachments" download><span class="dashicons dashicons-media-audio"></span>' . __( 'MP3', 'sermon-manager' ) . '</a>';
 	}
diff --git a/includes/types-taxonomies.php b/includes/types-taxonomies.php
index 62031fd..c664b47 100755
--- a/includes/types-taxonomies.php
+++ b/includes/types-taxonomies.php
@@ -296,7 +296,7 @@ function wpfc_sermon_metaboxes() {
 		'desc'    => __( 'Type a brief description about this sermon, an outline, or a full manuscript', 'sermon-manager' ),
 		'id'      => 'sermon_description',
 		'type'    => 'wysiwyg',
-		'options' => array( 'textarea_rows' => 7, 'media_buttons' => false, ),
+		'options' => array( 'textarea_rows' => 7, 'media_buttons' => true, ),
 	) );
 
 	$cmb2 = new_cmb2_box( array(
@@ -320,7 +320,7 @@ function wpfc_sermon_metaboxes() {
 	) );
 	$cmb2->add_field( array(
 		'name' => __( 'MP3 Duration', 'sermon-manager' ),
-		'desc' => __( 'Length in minutes (if left blank, will attempt to calculate automatically when you save)', 'sermon-manager' ),
+		'desc' => __( 'Length in <code>hh:mm:ss</code> format (if left blank, will attempt to calculate automatically when you save)', 'sermon-manager' ),
 		'id'   => '_wpfc_sermon_duration',
 		'type' => 'text',
 	) );
@@ -358,22 +358,22 @@ function wpfc_sermon_metaboxes() {
 
 }
 
-// Custom taxonomy terms dropdown function
-function wpfc_get_term_dropdown( $taxonomy ) {
-	$terms            = get_terms( $taxonomy );
-	$current_preacher = get_query_var( 'wpfc_preacher' );
-	$current_series   = get_query_var( 'wpfc_sermon_series' );
-	$current_topic    = get_query_var( 'wpfc_sermon_topics' );
-	$current_book     = get_query_var( 'wpfc_bible_book' );
-	$html             = '';
-	foreach ( $terms as $term ) {
-		$term_slug = $term->slug;
-		$term_name = $term->name;
-		if ( $term_slug == $current_preacher || $term_slug == $current_series || $term_slug == $current_topic || $term_slug == $current_book ) {
-			$html .= '<option value="' . $term_slug . '" selected>' . $term_name . '</option>';
-		} else {
-			$html .= '<option value="' . $term_slug . '">' . $term_name . '</option>';
-		}
+/**
+ * Build <option> fields for <select> element
+ *
+ * @param string $taxonomy Taxonomy name
+ * @param string $default  Force a default value regardless the query var
+ *
+ * @return string HTML <option> fields
+ *
+ * @since 2.5.0 added $default
+ */
+function wpfc_get_term_dropdown( $taxonomy, $default = '' ) {
+	// reset var
+	$html = '';
+
+	foreach ( get_terms( $taxonomy ) as $term ) {
+		$html .= '<option value="' . $term->slug . '" ' . ( ( $default === '' ? $term->slug === get_query_var( $taxonomy ) : $term->slug === $default ) ? 'selected' : '' ) . '>' . $term->name . '</option>';
 	}
 
 	return $html;
diff --git a/js/dismiss-php.js b/js/dismiss-php.js
new file mode 100644
index 0000000..858fa00
--- /dev/null
+++ b/js/dismiss-php.js
@@ -0,0 +1,12 @@
+// Modified from: https://wordpress.stackexchange.com/a/251191/111583
+jQuery(function ($) {
+    $(document).on('click', '.notice-wpfc-php .notice-dismiss', function () {
+        $.ajax(ajaxurl, {
+            type: 'POST',
+            data: {
+                action: 'wpfc_php_notice_handler',
+                type: $(this).closest('.notice-wpfc-php').data('notice')
+            }
+        });
+    });
+});
\ No newline at end of file
diff --git a/readme.txt b/readme.txt
index 86e322d..2e0f9ea 100755
--- a/readme.txt
+++ b/readme.txt
@@ -4,7 +4,8 @@ Donate link: http://wpforchurch.com/
 Tags: church, sermon, sermons, preaching, podcasting
 Requires at least: 4.5
 Tested up to: 4.8.1
-Stable tag: 2.4.11
+Stable tag: 2.5.0
+Requires PHP: 5.6
 
 Add audio and video sermons, manage speakers, series, and more to your church website.
 
@@ -83,6 +84,13 @@ Visit the [plugin homepage](https://wpforchurch.com/wordpress-plugins/sermon-man
 2. Sermon Files
 
 == Changelog ==
+= 2.5.0 =
+* Add media functions in the sermon editor
+* Add options to filtering shortcode
+* Fix filtering shortcode sometimes making 404 on filter
+* Fix PHP warning not dismissible
+* Tweak sermon audio length field description (thanks @macbookandrew)
+
 = 2.4.11 =
 * Fix paragraphs in podcast feed description
 * Fix podcasts not validating with exotic mp3 file names
diff --git a/sermons.php b/sermons.php
index d96199a..fe4aa60 100755
--- a/sermons.php
+++ b/sermons.php
@@ -3,7 +3,7 @@
 Plugin Name: Sermon Manager for WordPress
 Plugin URI: http://www.wpforchurch.com/products/sermon-manager-for-wordpress/
 Description: Add audio and video sermons, manage speakers, series, and more. Visit <a href="http://wpforchurch.com" target="_blank">Wordpress for Church</a> for tutorials and support.
-Version: 2.4.11
+Version: 2.5.0
 Author: WP for Church
 Contributors: wpforchurch, jprummer, jamzth
 Author URI: http://www.wpforchurch.com/
@@ -14,7 +14,7 @@
 
 defined( 'ABSPATH' ) or die;
 
-// All files must be PHP 5.2 compatible
+// All files must be PHP 5.6 compatible
 
 class SermonManager {
 
@@ -28,18 +28,21 @@ class SermonManager {
 	 * Construct
 	 */
 	public function __construct() {
+		// Define constants (PATH and URL are with a trailing slash)
+		define( 'SERMON_MANAGER_PATH', plugin_dir_path( __FILE__ ) );
+		define( 'SERMON_MANAGER_URL', plugin_dir_url( __FILE__ ) );
+		define( 'SERMON_MANAGER_VERSION', preg_match( '/^.*Version: (.*)$/m', file_get_contents( __FILE__ ), $version ) ? trim( $version[1] ) : 'N/A' );
+
 		// Check the PHP version
 		if ( version_compare( PHP_VERSION, '5.6.0', '<' ) ) {
-			if ( is_admin() ) {
+			if ( is_admin() && ! get_option( 'dismissed-render_php_version_warning', 0 ) ) {
 				add_action( 'admin_notices', array( $this, 'render_php_version_warning' ) );
+				add_action( 'admin_enqueue_scripts', function () {
+					wp_enqueue_script( 'wpfc-php-notice-handler', SERMON_MANAGER_URL . 'js/dismiss-php.js', array(), SERMON_MANAGER_VERSION );
+				} );
 			}
 		}
 
-		// Define constants (PATH and URL are with a trailing slash)
-		define( 'SERMON_MANAGER_PATH', plugin_dir_path( __FILE__ ) );
-		define( 'SERMON_MANAGER_URL', plugin_dir_url( __FILE__ ) );
-		define( 'SERMON_MANAGER_VERSION', preg_match( '/^.*Version: (.*)$/m', file_get_contents( __FILE__ ), $version ) ? trim( $version[1] ) : 'N/A' );
-
 		// Include required items
 		$this->includes();
 
@@ -57,11 +60,61 @@ public function __construct() {
 		add_action( 'after_setup_theme', array( $this, 'add_image_sizes' ) );
 		// no idea... better not touch it for now.
 		add_filter( 'sermon-images-disable-public-css', '__return_true' );
+		// Handler for dismissing PHP warning notice
+		add_action( 'wp_ajax_wpfc_php_notice_handler', array( $this, 'php_notice_handler' ) );
 
 		// do dates fixing
 		$this->fix_dates();
 	}
 
+	/**
+	 * Include Sermon Manager files
+	 *
+	 * @return void
+	 */
+	private function includes() {
+		/**
+		 * Files to include on frontend and backend
+		 */
+		$includes = array(
+			'/includes/legacy-php.php', // Old PHP compatibility fixes
+			'/includes/types-taxonomies.php', // Post Types and Taxonomies
+			'/includes/taxonomy-images/taxonomy-images.php', // Images for Custom Taxonomies
+			'/includes/entry-views.php', // Entry Views Tracking
+			'/includes/shortcodes.php', // Shortcodes
+			'/includes/widgets.php', // Widgets
+			'/includes/template-tags.php', // Template Tags
+			'/includes/podcast-functions.php', // Podcast Functions
+			'/includes/helper-functions.php', // Global Helper Functions
+			'/includes/sm-deprecated-functions.php', // Deprecated SM functions
+		);
+
+		/**
+		 * Admin only includes
+		 */
+		$admin_includes = array(
+			'/includes/admin-functions.php', // General Admin area functions
+			'/includes/CMB2/init.php', // Metaboxes
+			'/includes/options.php', // Options Page
+		);
+
+		// Load files
+		foreach ( $includes as $file ) {
+			if ( file_exists( SERMON_MANAGER_PATH . $file ) ) {
+				require_once SERMON_MANAGER_PATH . $file;
+			}
+		}
+
+		// Load admin files
+		if ( is_admin() ) {
+			foreach ( $admin_includes as $file ) {
+				if ( file_exists( SERMON_MANAGER_PATH . $file ) ) {
+					require_once SERMON_MANAGER_PATH . $file;
+				}
+			}
+		}
+	}
+
 	private function fix_dates() {
 		if ( ! isset( $_GET['sm_fix_dates'] ) ) {
 			if ( get_option( 'wpfc_sm_dates_convert_done', 0 ) == 1 || ! is_admin() ) {
@@ -147,54 +200,6 @@ private function fix_dates() {
 		update_option( 'wpfc_sm_dates_convert_done', 1 );
 	}
 
-	/**
-	 * Include Sermon Manager files
-	 *
-	 * @return void
-	 */
-	private function includes() {
-		/**
-		 * Files to include on frontend and backend
-		 */
-		$includes = array(
-			'/includes/legacy-php.php', // Old PHP compatibility fixes
-			'/includes/types-taxonomies.php', // Post Types and Taxonomies
-			'/includes/taxonomy-images/taxonomy-images.php', // Images for Custom Taxonomies
-			'/includes/entry-views.php', // Entry Views Tracking
-			'/includes/shortcodes.php', // Shortcodes
-			'/includes/widgets.php', // Widgets
-			'/includes/template-tags.php', // Template Tags
-			'/includes/podcast-functions.php', // Podcast Functions
-			'/includes/helper-functions.php', // Global Helper Functions
-            '/includes/sm-deprecated-functions.php', // Deprecated SM functions
-		);
-
-		/**
-		 * Admin only includes
-		 */
-		$admin_includes = array(
-			'/includes/admin-functions.php', // General Admin area functions
-			'/includes/CMB2/init.php', // Metaboxes
-			'/includes/options.php', // Options Page
-		);
-
-		// Load files
-		foreach ( $includes as $file ) {
-			if ( file_exists( SERMON_MANAGER_PATH . $file ) ) {
-				require_once SERMON_MANAGER_PATH . $file;
-			}
-		}
-
-		// Load admin files
-		if ( is_admin() ) {
-			foreach ( $admin_includes as $file ) {
-				if ( file_exists( SERMON_MANAGER_PATH . $file ) ) {
-					require_once SERMON_MANAGER_PATH . $file;
-				}
-			}
-		}
-	}
-
 	/**
 	 * Creates or returns an instance of this class.
 	 *
@@ -359,13 +364,20 @@ public static function set_default_options() {
 	 */
 	public static function render_php_version_warning() {
 		?>
-        <div class="notice notice-warning is-dismissible">
+        <div class="notice notice-wpfc-php notice-warning is-dismissible" data-notice="render_php_version_warning">
             <p>
 				<?php echo sprintf( "You are running <strong>PHP %s</strong>, but Sermon Manager recommends <strong>PHP %s</strong>. If you encounter issues, update PHP to a recommended version and check if they are still there.", PHP_VERSION, '5.6.0' ); ?>
             </p>
         </div>
 		<?php
 	}
+
+	/**
+	 * AJAX handler to store the state of dismissible notices.
+	 */
+	function php_notice_handler() {
+		update_option( 'dismissed-' . $_POST['type'], 1 );
+	}
 }
 
 // Initialize Sermon Manager
diff --git a/views/archive-wpfc_sermon.php b/views/archive-wpfc_sermon.php
index 2c1687f..eee68d1 100755
--- a/views/archive-wpfc_sermon.php
+++ b/views/archive-wpfc_sermon.php
@@ -1,9 +1,6 @@
 <?php
 /**
  * The template for displaying Sermon Archive pages.
- * To see this visit the http://yourdomain.com/sermons if you have permalinks enabled
- * or http://yourdomain.com/?post_type=wpfc_sermon if not.
- *
  */
 
 get_header(); ?>
@@ -11,88 +8,74 @@
 
 <div id="container">
     <div id="content" role="main">
-		<?php
-		if ( trim( \SermonManager::getOption( 'archive_title' ) ) === '' ):
-			$archive_title = 'Sermons';
-		endif;
-		?>
-        <h1 class="page-title"><?php echo $archive_title; ?></h1>
+        <h1 class="page-title"><?php echo trim( \SermonManager::getOption( 'archive_title' ) ) === '' ? 'Sermons' : \SermonManager::getOption( 'archive_title' ); ?></h1>
 		<?php echo render_wpfc_sorting(); ?>
-		<?php /* Display navigation to next/previous pages when applicable */ ?>
 		<?php if ( $wp_query->max_num_pages > 1 ) : ?>
             <div id="nav-above" class="navigation">
-                <div
-                        class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'sermon-manager' ) ); ?></div>
-                <div
-                        class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'sermon-manager' ) ); ?></div>
-            </div><!-- #nav-above -->
+                <div class="nav-previous">
+					<?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older sermons', 'sermon-manager' ) ); ?>
+                </div>
+                <div class="nav-next">
+					<?php previous_posts_link( __( 'Newer sermons <span class="meta-nav">&rarr;</span>', 'sermon-manager' ) ); ?>
+                </div>
+            </div>
 		<?php endif; ?>
 
-		<?php /* If there are no posts to display, such as an empty archive page */ ?>
 		<?php if ( ! have_posts() ) : ?>
             <div id="post-0" class="post error404 not-found">
                 <h1 class="entry-title"><?php _e( 'Not Found', 'sermon-manager' ); ?></h1>
                 <div class="entry-content">
                     <p><?php _e( 'Apologies, but no sermons were found.', 'sermon-manager' ); ?></p>
 					<?php get_search_form(); ?>
-                </div><!-- .entry-content -->
-            </div><!-- #post-0 -->
+                </div>
+            </div>
 		<?php endif; ?>
 
-		<?php
-		/* Start the Loop.
-		 *
-		 * In Twenty Ten we use the same loop in multiple contexts.
-		 * It is broken into three main parts: when we're displaying
-		 * posts that are in the gallery category, when we're displaying
-		 * posts in the asides category, and finally all other posts.
-		 *
-		 * Additionally, we sometimes check for whether we are on an
-		 * archive page, a search page, etc., allowing for small differences
-		 * in the loop on each template without actually duplicating
-		 * the rest of the loop that is shared.
-		 *
-		 * Without further ado, the loop:
-		 */ ?>
 		<?php while ( have_posts() ) : the_post(); ?>
-
             <div id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
-                <h2 class="entry-title"><a href="<?php the_permalink(); ?>"
-                                           title="<?php printf( esc_attr__( 'Permalink to %s', 'sermon-manager' ), the_title_attribute( 'echo=0' ) ); ?>"
-                                           rel="bookmark"><?php the_title(); ?></a></h2>
+                <h2 class="entry-title">
+                    <a href="<?php the_permalink(); ?>" rel="bookmark"
+                       title="<?php printf( esc_attr__( 'Permalink to %s', 'sermon-manager' ), the_title_attribute( 'echo=0' ) ); ?>">
+						<?php the_title(); ?>
+                    </a>
+                </h2>
 
                 <div class="entry-meta">
-					<span
-                            class="meta-prep meta-prep-author">Preached on </span> <?php wpfc_sermon_date( 'l, F j, Y' ); ?>
-                    <span
-                            class="meta-sep"> by </span> <?php echo the_terms( $post->ID, 'wpfc_preacher', '', ', ', ' ' ); ?>
-                </div><!-- .entry-meta -->
+					<span class="meta-prep meta-prep-author">
+                        Preached on
+                    </span>
+                    <?php wpfc_sermon_date( 'l, F j, Y' ); ?>
+                    <span class="meta-sep"> by </span>
+                    <?php echo the_terms( $post->ID, 'wpfc_preacher', '', ', ', ' ' ); ?>
+                </div>
 
                 <div class="entry-content">
 					<?php wpfc_sermon_excerpt(); ?>
-                </div><!-- .entry-content -->
+                </div>
 
                 <div class="entry-utility">
-					<span
-                            class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'sermon-manager' ), __( '1 Comment', 'sermon-manager' ), __( '% Comments', 'sermon-manager' ) ); ?></span>
+					<span class="comments-link">
+                        <?php comments_popup_link( __( 'Leave a comment', 'sermon-manager' ), __( '1 Comment', 'sermon-manager' ), __( '% Comments', 'sermon-manager' ) ); ?>
+                    </span>
 					<?php edit_post_link( __( 'Edit', 'sermon-manager' ), '<span class="meta-sep">|</span> <span class="edit-link">', '</span>' ); ?>
-                </div><!-- .entry-utility -->
-            </div><!-- #post-## -->
+                </div>
+            </div>
 
-		<?php endwhile; // End the loop. Whew. ?>
+		<?php endwhile; ?>
 
-		<?php /* Display navigation to next/previous pages when applicable */ ?>
 		<?php if ( $wp_query->max_num_pages > 1 ) : ?>
             <div id="nav-below" class="navigation">
-                <div
-                        class="nav-previous"><?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older posts', 'sermon-manager' ) ); ?></div>
-                <div
-                        class="nav-next"><?php previous_posts_link( __( 'Newer posts <span class="meta-nav">&rarr;</span>', 'sermon-manager' ) ); ?></div>
-            </div><!-- #nav-below -->
+                <div class="nav-previous">
+                    <?php next_posts_link( __( '<span class="meta-nav">&larr;</span> Older sermons', 'sermon-manager' ) ); ?>
+                </div>
+                <div class="nav-next">
+                    <?php previous_posts_link( __( 'Newer sermons <span class="meta-nav">&rarr;</span>', 'sermon-manager' ) ); ?>
+                </div>
+            </div>
 		<?php endif; ?>
 
-    </div><!-- #content -->
-</div><!-- #container -->
+    </div>
+</div>
 
 <?php get_sidebar(); ?>
 <?php get_footer(); ?>