diff --git a/functions-trying to add nav extras the first way.php b/functions-trying to add nav extras the first way.php
new file mode 100644
index 0000000..cbec066
--- /dev/null
+++ b/functions-trying to add nav extras the first way.php	
@@ -0,0 +1,304 @@
+<?php
+
+/*===========================================
+ * Genesis Theme Basics
+===========================================*/
+
+// Start the engine
+include_once( get_template_directory() . '/lib/init.php' );
+
+// Other includes
+require_once dirname( __FILE__ ) . '/includes/admin/admin.php';
+
+// Child theme (do not remove)
+define( 'CHILD_THEME_NAME', 'Trestle' );
+define( 'CHILD_THEME_URL', 'http://www.mightyminnow.com/2013/08/our-new-mobile-first-child-theme-for-genesis-2-0/' );
+define( 'CHILD_THEME_VERSION', '1.3' );
+
+// Add HTML5 markup structure
+add_theme_support( 'html5' );
+
+// Add viewport meta tag for mobile browsers
+add_theme_support( 'genesis-responsive-viewport' );
+
+// Add support for custom background
+add_theme_support( 'custom-background' );
+
+// Add support for 3-column footer widgets
+add_theme_support( 'genesis-footer-widgets', 3 );
+
+
+/*===========================================
+ * Header styles and scripts
+===========================================*/
+
+function trestle_header_actions() {
+
+	// Google fonts
+	wp_enqueue_style( 'google-fonts', '//fonts.googleapis.com/css?family=Lato:300,700' );
+
+	// Custom jQuery
+	wp_enqueue_script( 'trestle_jquery', get_stylesheet_directory_uri() . '/includes/js/trestle-jquery.js', array( 'jquery' ), '1.0', true );
+
+}
+add_action( 'wp_enqueue_scripts', 'trestle_header_actions');
+
+
+/*===========================================
+ * Admin styles and scripts
+===========================================*/
+function trestle_admin_actions() {
+    add_editor_style( get_stylesheet_directory_uri() . '/includes/admin/admin.css' );
+}
+add_action( 'init', 'trestle_admin_actions' );
+
+
+/*===========================================
+ * Load Required/Suggested Plugins
+ * 
+ * Utilizes TGM Plugin Activation class: https://github.com/thomasgriffin/TGM-Plugin-Activation
+===========================================*/
+
+// Include plugin activation class
+require_once dirname( __FILE__ ) . '/includes/classes/class-tgm-plugin-activation.php';
+
+// Fetch & install plugins from wordpress.org
+function trestle_register_required_plugins() {
+
+	$plugins = array(
+
+		// Required plugins
+		array(
+			'name' 		=> 'Font Awesome Icons',
+			'slug' 		=> 'font-awesome',
+			'required' 	=> true,
+		),
+
+		// Optional plugins
+		array(
+			'name' 		=> 'Black Studio TinyMCE Widget',
+			'slug' 		=> 'black-studio-tinymce-widget',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Events Manager',
+			'slug' 		=> 'events-manager',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Exclude Pages',
+			'slug' 		=> 'exclude-pages',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'FancyBox for WordPress',
+			'slug' 		=> 'fancybox-for-wordpress',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Genesis Featured Widget Amplified',
+			'slug' 		=> 'genesis-featured-widget-amplified',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Genesis Simple Edits',
+			'slug' 		=> 'genesis-simple-edits',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'MapPress Easy Google Maps',
+			'slug' 		=> 'mappress-google-maps-for-wordpress',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'My Page Order',
+			'slug' 		=> 'my-page-order',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'NextGen Gallery',
+			'slug' 		=> 'nextgen-gallery',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Post Thumbnail Editor',
+			'slug' 		=> 'post-thumbnail-editor',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Social Media Widget',
+			'slug' 		=> 'social-media-widget',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Widget Context',
+			'slug' 		=> 'widget-context',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Respond.js',
+			'slug' 		=> 'respondjs',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Simple Image Sizes',
+			'slug' 		=> 'simple-image-sizes',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Simple Section Navigation',
+			'slug' 		=> 'simple-section-navigation',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Types - Custom Fields and Custom Post Types Management',
+			'slug' 		=> 'types',
+			'required' 	=> true,
+		),
+
+	);
+
+	// Change this to your theme text domain, used for internationalising strings
+	$theme_text_domain = 'mightyminnow';
+
+	/**
+	 * Array of configuration settings. Amend each line as needed.
+	 * If you want the default strings to be available under your own theme domain,
+	 * leave the strings uncommented.
+	 * Some of the strings are added into a sprintf, so see the comments at the
+	 * end of each line for what each argument will be.
+	 */
+	$config = array(
+		'domain'       		=> $theme_text_domain,         	// Text domain - likely want to be the same as your theme.
+		'default_path' 		=> '',                         	// Default absolute path to pre-packaged plugins
+		'parent_menu_slug' 	=> 'themes.php', 				// Default parent menu slug
+		'parent_url_slug' 	=> 'themes.php', 				// Default parent URL slug
+		'menu'         		=> 'install-required-plugins', 	// Menu slug
+		'has_notices'      	=> true,                       	// Show admin notices or not
+		'is_automatic'    	=> true,					   	// Automatically activate plugins after installation or not
+		'message' 			=> '',							// Message to output right before the plugins table
+		'strings'      		=> array(
+			'page_title'                       			=> __( 'Install Required Plugins', $theme_text_domain ),
+			'menu_title'                       			=> __( 'Install Plugins', $theme_text_domain ),
+			'installing'                       			=> __( 'Installing Plugin: %s', $theme_text_domain ), // %1$s = plugin name
+			'oops'                             			=> __( 'Something went wrong with the plugin API.', $theme_text_domain ),
+			'notice_can_install_required'     			=> _n_noop( 'This theme requires the following plugin: %1$s.', 'This theme requires the following plugins: %1$s.' ), // %1$s = plugin name(s)
+			'notice_can_install_recommended'			=> _n_noop( 'This theme recommends the following plugin: %1$s.', 'This theme recommends the following plugins: %1$s.' ), // %1$s = plugin name(s)
+			'notice_cannot_install'  					=> _n_noop( 'Sorry, but you do not have the correct permissions to install the %s plugin. Contact the administrator of this site for help on getting the plugin installed.', 'Sorry, but you do not have the correct permissions to install the %s plugins. Contact the administrator of this site for help on getting the plugins installed.' ), // %1$s = plugin name(s)
+			'notice_can_activate_required'    			=> _n_noop( 'The following required plugin is currently inactive: %1$s.', 'The following required plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s)
+			'notice_can_activate_recommended'			=> _n_noop( 'The following recommended plugin is currently inactive: %1$s.', 'The following recommended plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s)
+			'notice_cannot_activate' 					=> _n_noop( 'Sorry, but you do not have the correct permissions to activate the %s plugin. Contact the administrator of this site for help on getting the plugin activated.', 'Sorry, but you do not have the correct permissions to activate the %s plugins. Contact the administrator of this site for help on getting the plugins activated.' ), // %1$s = plugin name(s)
+			'notice_ask_to_update' 						=> _n_noop( 'The following plugin needs to be updated to its latest version to ensure maximum compatibility with this theme: %1$s.', 'The following plugins need to be updated to their latest version to ensure maximum compatibility with this theme: %1$s.' ), // %1$s = plugin name(s)
+			'notice_cannot_update' 						=> _n_noop( 'Sorry, but you do not have the correct permissions to update the %s plugin. Contact the administrator of this site for help on getting the plugin updated.', 'Sorry, but you do not have the correct permissions to update the %s plugins. Contact the administrator of this site for help on getting the plugins updated.' ), // %1$s = plugin name(s)
+			'install_link' 					  			=> _n_noop( 'Begin installing plugin', 'Begin installing plugins' ),
+			'activate_link' 				  			=> _n_noop( 'Activate installed plugin', 'Activate installed plugins' ),
+			'return'                           			=> __( 'Return to Required Plugins Installer', $theme_text_domain ),
+			'plugin_activated'                 			=> __( 'Plugin activated successfully.', $theme_text_domain ),
+			'complete' 									=> __( 'All plugins installed and activated successfully. %s', $theme_text_domain ), // %1$s = dashboard link
+			'nag_type'									=> 'updated' // Determines admin notice type - can only be 'updated' or 'error'
+		)
+	);
+
+	tgmpa( $plugins, $config );
+
+}
+add_action( 'tgmpa_register', 'trestle_register_required_plugins' );
+
+
+/*===========================================
+ * Auto & Mobile Navigation
+===========================================*/
+
+function trestle_nav_modifications() {
+
+	// Auto-generate nav if Genesis theme setting is checked
+	if ( 1 == genesis_get_option( 'auto_nav' ) ) {
+
+		// Remove existing nav
+		remove_action( 'genesis_after_header', 'genesis_do_nav' );
+
+		// Replace existing nav with auto-generated nav
+		function trestle_auto_nav() {
+			
+			$args = array(
+				'echo'           => false,
+				'show_home'      => genesis_get_option( 'include_home_link' ),
+				'menu_class'     => ''
+			);
+
+			$ul_class = 'menu genesis-nav-menu menu-primary';
+
+			$menu_args = new stdClass();
+
+			$menu_args->theme_location = 'primary';
+
+			$nav_items = genesis_nav_right( preg_replace('/\/?<ul>/', '', wp_page_menu( $args ) , 1), $menu_args );
+
+			echo '<pre>' . print_r($nav_items, true) . '</pre>';
+					
+			$nav = '<ul class="' . $ul_class . '">' . $nav_items . '</ul>';
+
+			$nav_markup_open = genesis_markup( array(
+				'html5'   => '<nav %s>',
+				'xhtml'   => '<div id="nav">',
+				'context' => 'nav-primary',
+				'echo'    => false,
+			) );
+			$nav_markup_open .= genesis_structural_wrap( 'menu-primary', 'open', 0 );
+
+			$nav_markup_close  = genesis_structural_wrap( 'menu-primary', 'close', 0 );
+			$nav_markup_close .= genesis_html5() ? '</nav>' : '</div>';
+
+			// Args to pass to navigation right/extras function
+			$args = new stdClass();
+			$args->theme_location = 'primary';
+
+			echo apply_filters ( 'trestle_do_nav', $nav_markup_open . $nav . $nav_markup_close, $args );
+		}
+		add_action( 'genesis_after_header', 'trestle_auto_nav', 10 );
+
+	}       	
+           
+}
+add_action( 'init', 'trestle_nav_modifications' );
+
+// Add mobile menu button
+function trestle_add_mobile_nav() {
+	if ( 1 == genesis_get_option( 'auto_nav' ) || has_nav_menu( 'primary' ) )
+		echo '<a id="menu-button" class="button" href="javascript: void()"><i class="icon-list-ul"></i>&nbsp;&nbsp;Navigation</a>';
+}
+add_action( 'genesis_after_header', 'trestle_add_mobile_nav', 0 );
+
+
+/*===========================================
+ * Actions & Filters
+===========================================*/
+
+
+/*===========================================
+ * Footer
+===========================================*/
+function trestle_custom_footer($output) {
+	return $output . '<p class="mm">[footer_childtheme_link before=""] by <a href="http://mightyminnow.com">MIGHTYminnow</a></p>';
+}
+add_filter( 'genesis_footer_output', 'trestle_custom_footer' );
+
+
+/*===========================================
+ * Shortcodes
+===========================================*/
\ No newline at end of file
diff --git a/functions-trying to better filter for auto-nav.php b/functions-trying to better filter for auto-nav.php
new file mode 100644
index 0000000..35f1975
--- /dev/null
+++ b/functions-trying to better filter for auto-nav.php	
@@ -0,0 +1,275 @@
+<?php
+
+/*===========================================
+ * Genesis Theme Basics
+===========================================*/
+
+// Start the engine
+include_once( get_template_directory() . '/lib/init.php' );
+
+// Other includes
+require_once dirname( __FILE__ ) . '/includes/admin/admin.php';
+
+// Child theme (do not remove)
+define( 'CHILD_THEME_NAME', 'Trestle' );
+define( 'CHILD_THEME_URL', 'http://www.mightyminnow.com/2013/08/our-new-mobile-first-child-theme-for-genesis-2-0/' );
+define( 'CHILD_THEME_VERSION', '1.3' );
+
+// Add HTML5 markup structure
+add_theme_support( 'html5' );
+
+// Add viewport meta tag for mobile browsers
+add_theme_support( 'genesis-responsive-viewport' );
+
+// Add support for custom background
+add_theme_support( 'custom-background' );
+
+// Add support for 3-column footer widgets
+add_theme_support( 'genesis-footer-widgets', 3 );
+
+
+/*===========================================
+ * Header styles and scripts
+===========================================*/
+
+function trestle_header_actions() {
+
+	// Google fonts
+	wp_enqueue_style( 'google-fonts', '//fonts.googleapis.com/css?family=Lato:300,700' );
+
+	// Custom jQuery
+	wp_enqueue_script( 'trestle_jquery', get_stylesheet_directory_uri() . '/includes/js/trestle-jquery.js', array( 'jquery' ), '1.0', true );
+
+}
+add_action( 'wp_enqueue_scripts', 'trestle_header_actions');
+
+
+/*===========================================
+ * Admin styles and scripts
+===========================================*/
+function trestle_admin_actions() {
+    add_editor_style( get_stylesheet_directory_uri() . '/includes/admin/admin.css' );
+}
+add_action( 'init', 'trestle_admin_actions' );
+
+
+/*===========================================
+ * Load Required/Suggested Plugins
+ * 
+ * Utilizes TGM Plugin Activation class: https://github.com/thomasgriffin/TGM-Plugin-Activation
+===========================================*/
+
+// Include plugin activation class
+require_once dirname( __FILE__ ) . '/includes/classes/class-tgm-plugin-activation.php';
+
+// Fetch & install plugins from wordpress.org
+function trestle_register_required_plugins() {
+
+	$plugins = array(
+
+		// Required plugins
+		array(
+			'name' 		=> 'Font Awesome Icons',
+			'slug' 		=> 'font-awesome',
+			'required' 	=> true,
+		),
+
+		// Optional plugins
+		array(
+			'name' 		=> 'Black Studio TinyMCE Widget',
+			'slug' 		=> 'black-studio-tinymce-widget',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Events Manager',
+			'slug' 		=> 'events-manager',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Exclude Pages',
+			'slug' 		=> 'exclude-pages',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'FancyBox for WordPress',
+			'slug' 		=> 'fancybox-for-wordpress',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Genesis Featured Widget Amplified',
+			'slug' 		=> 'genesis-featured-widget-amplified',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Genesis Simple Edits',
+			'slug' 		=> 'genesis-simple-edits',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'MapPress Easy Google Maps',
+			'slug' 		=> 'mappress-google-maps-for-wordpress',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'My Page Order',
+			'slug' 		=> 'my-page-order',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'NextGen Gallery',
+			'slug' 		=> 'nextgen-gallery',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Post Thumbnail Editor',
+			'slug' 		=> 'post-thumbnail-editor',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Social Media Widget',
+			'slug' 		=> 'social-media-widget',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Widget Context',
+			'slug' 		=> 'widget-context',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Respond.js',
+			'slug' 		=> 'respondjs',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Simple Image Sizes',
+			'slug' 		=> 'simple-image-sizes',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Simple Section Navigation',
+			'slug' 		=> 'simple-section-navigation',
+			'required' 	=> true,
+		),
+
+		array(
+			'name' 		=> 'Types - Custom Fields and Custom Post Types Management',
+			'slug' 		=> 'types',
+			'required' 	=> true,
+		),
+
+	);
+
+	// Change this to your theme text domain, used for internationalising strings
+	$theme_text_domain = 'mightyminnow';
+
+	/**
+	 * Array of configuration settings. Amend each line as needed.
+	 * If you want the default strings to be available under your own theme domain,
+	 * leave the strings uncommented.
+	 * Some of the strings are added into a sprintf, so see the comments at the
+	 * end of each line for what each argument will be.
+	 */
+	$config = array(
+		'domain'       		=> $theme_text_domain,         	// Text domain - likely want to be the same as your theme.
+		'default_path' 		=> '',                         	// Default absolute path to pre-packaged plugins
+		'parent_menu_slug' 	=> 'themes.php', 				// Default parent menu slug
+		'parent_url_slug' 	=> 'themes.php', 				// Default parent URL slug
+		'menu'         		=> 'install-required-plugins', 	// Menu slug
+		'has_notices'      	=> true,                       	// Show admin notices or not
+		'is_automatic'    	=> true,					   	// Automatically activate plugins after installation or not
+		'message' 			=> '',							// Message to output right before the plugins table
+		'strings'      		=> array(
+			'page_title'                       			=> __( 'Install Required Plugins', $theme_text_domain ),
+			'menu_title'                       			=> __( 'Install Plugins', $theme_text_domain ),
+			'installing'                       			=> __( 'Installing Plugin: %s', $theme_text_domain ), // %1$s = plugin name
+			'oops'                             			=> __( 'Something went wrong with the plugin API.', $theme_text_domain ),
+			'notice_can_install_required'     			=> _n_noop( 'This theme requires the following plugin: %1$s.', 'This theme requires the following plugins: %1$s.' ), // %1$s = plugin name(s)
+			'notice_can_install_recommended'			=> _n_noop( 'This theme recommends the following plugin: %1$s.', 'This theme recommends the following plugins: %1$s.' ), // %1$s = plugin name(s)
+			'notice_cannot_install'  					=> _n_noop( 'Sorry, but you do not have the correct permissions to install the %s plugin. Contact the administrator of this site for help on getting the plugin installed.', 'Sorry, but you do not have the correct permissions to install the %s plugins. Contact the administrator of this site for help on getting the plugins installed.' ), // %1$s = plugin name(s)
+			'notice_can_activate_required'    			=> _n_noop( 'The following required plugin is currently inactive: %1$s.', 'The following required plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s)
+			'notice_can_activate_recommended'			=> _n_noop( 'The following recommended plugin is currently inactive: %1$s.', 'The following recommended plugins are currently inactive: %1$s.' ), // %1$s = plugin name(s)
+			'notice_cannot_activate' 					=> _n_noop( 'Sorry, but you do not have the correct permissions to activate the %s plugin. Contact the administrator of this site for help on getting the plugin activated.', 'Sorry, but you do not have the correct permissions to activate the %s plugins. Contact the administrator of this site for help on getting the plugins activated.' ), // %1$s = plugin name(s)
+			'notice_ask_to_update' 						=> _n_noop( 'The following plugin needs to be updated to its latest version to ensure maximum compatibility with this theme: %1$s.', 'The following plugins need to be updated to their latest version to ensure maximum compatibility with this theme: %1$s.' ), // %1$s = plugin name(s)
+			'notice_cannot_update' 						=> _n_noop( 'Sorry, but you do not have the correct permissions to update the %s plugin. Contact the administrator of this site for help on getting the plugin updated.', 'Sorry, but you do not have the correct permissions to update the %s plugins. Contact the administrator of this site for help on getting the plugins updated.' ), // %1$s = plugin name(s)
+			'install_link' 					  			=> _n_noop( 'Begin installing plugin', 'Begin installing plugins' ),
+			'activate_link' 				  			=> _n_noop( 'Activate installed plugin', 'Activate installed plugins' ),
+			'return'                           			=> __( 'Return to Required Plugins Installer', $theme_text_domain ),
+			'plugin_activated'                 			=> __( 'Plugin activated successfully.', $theme_text_domain ),
+			'complete' 									=> __( 'All plugins installed and activated successfully. %s', $theme_text_domain ), // %1$s = dashboard link
+			'nag_type'									=> 'updated' // Determines admin notice type - can only be 'updated' or 'error'
+		)
+	);
+
+	tgmpa( $plugins, $config );
+
+}
+add_action( 'tgmpa_register', 'trestle_register_required_plugins' );
+
+
+/*===========================================
+ * Auto & Mobile Navigation
+===========================================*/
+
+function trestle_nav_modifications( $items, $menu, $args ) {
+//echo '<pre>' . print_r($args, true) . '</pre>';
+
+
+	// Auto-generate nav if Genesis theme setting is checked
+	if ( 1 == genesis_get_option( 'auto_nav' ) ) {
+		
+		$args = array(
+			'echo'           => false,
+			'show_home'      => genesis_get_option( 'include_home_link' ),
+			'menu_class'     => ''
+		);
+
+		$ul_class = 'menu genesis-nav-menu menu-primary';
+
+		$items = get_posts( $args );		
+
+	}       		
+
+	return $items;
+           
+}
+add_filter( 'wp_get_nav_menu_items', 'trestle_nav_modifications', 99, 3 );
+
+// Add mobile menu button
+function trestle_add_mobile_nav() {
+	if ( 1 == genesis_get_option( 'auto_nav' ) || has_nav_menu( 'primary' ) )
+		echo '<a id="menu-button" class="button" href="javascript: void()"><i class="icon-list-ul"></i>&nbsp;&nbsp;Navigation</a>';
+}
+add_action( 'genesis_after_header', 'trestle_add_mobile_nav', 0 );
+
+
+/*===========================================
+ * Actions & Filters
+===========================================*/
+
+
+/*===========================================
+ * Footer
+===========================================*/
+function trestle_custom_footer($output) {
+	return $output . '<p class="mm">[footer_childtheme_link before=""] by <a href="http://mightyminnow.com">MIGHTYminnow</a></p>';
+}
+add_filter( 'genesis_footer_output', 'trestle_custom_footer' );
+
+
+/*===========================================
+ * Shortcodes
+===========================================*/
\ No newline at end of file
diff --git a/functions.php b/functions.php
index c5e2aaa..2656c63 100644
--- a/functions.php
+++ b/functions.php
@@ -238,12 +238,27 @@ function trestle_nav_modifications() {
 			$args = array(
 				'echo'           => false,
 				'show_home'      => genesis_get_option( 'include_home_link' ),
-				'menu_class'     => ''
+				'menu_class'     => 'auto-menu'
 			);
 
 			$ul_class = 'menu genesis-nav-menu menu-primary';
 
-			$nav = preg_replace('/<ul>/', '<ul class="' . $ul_class . '">', wp_page_menu( $args ) , 1);
+			$menu_args = new stdClass();
+
+			$menu_args->theme_location = 'primary';
+
+			$nav_items = wp_page_menu( $args );
+
+			// Remove opening <div class="auto-nav"><ul>
+			$nav_items = preg_replace( '/<div\s*.*auto-menu[^>]*>\s*<ul>/', '', $nav_items );
+
+			// Remove closing </ul></div>
+			$nav_items = preg_replace( '/<\/ul>\s*<\/div>/', '', $nav_items );
+			
+			// Add Genesis nav extras
+			$nav_items = genesis_nav_right( $nav_items, $menu_args );
+					
+			$nav = '<ul class="' . $ul_class . '">' . $nav_items . '</ul>';
 
 			$nav_markup_open = genesis_markup( array(
 				'html5'   => '<nav %s>',
@@ -256,23 +271,26 @@ function trestle_nav_modifications() {
 			$nav_markup_close  = genesis_structural_wrap( 'menu-primary', 'close', 0 );
 			$nav_markup_close .= genesis_html5() ? '</nav>' : '</div>';
 
-			echo apply_filters ( 'trestle_do_nav', $nav_markup_open . $nav . $nav_markup_close );
+			// Args to pass to navigation right/extras function
+			$args = new stdClass();
+			$args->theme_location = 'primary';
+
+			echo apply_filters ( 'trestle_do_nav', $nav_markup_open . $nav . $nav_markup_close, $args );
 		}
 		add_action( 'genesis_after_header', 'trestle_auto_nav', 10 );
 
-	}
-
-	// Add mobile menu button
-	function trestle_add_mobile_nav() {
-		if ( 1 == genesis_get_option( 'auto_nav' ) || has_nav_menu( 'primary' ) )
-			echo '<a id="menu-button" class="button" href="javascript: void()"><i class="icon-list-ul"></i>&nbsp;&nbsp;Navigation</a>';
-	}
-    add_action( 'genesis_after_header', 'trestle_add_mobile_nav', 0 );
-            	
+	}       	
            
 }
 add_action( 'init', 'trestle_nav_modifications' );
 
+// Add mobile menu button
+function trestle_add_mobile_nav() {
+	if ( 1 == genesis_get_option( 'auto_nav' ) || has_nav_menu( 'primary' ) )
+		echo '<a id="menu-button" class="button" href="javascript: void()"><i class="icon-list-ul"></i>&nbsp;&nbsp;Navigation</a>';
+}
+add_action( 'genesis_after_header', 'trestle_add_mobile_nav', 0 );
+
 
 /*===========================================
  * Actions & Filters
diff --git a/includes/js/trestle-jquery.js b/includes/js/trestle-jquery.js
index ba8e2e9..a4af506 100644
--- a/includes/js/trestle-jquery.js
+++ b/includes/js/trestle-jquery.js
@@ -1,19 +1,17 @@
-// as the page loads, cal these scripts
+// Executes when the document is ready
 jQuery(document).ready(function() {
 	
+	// Get our URL
 	var h = window.location.host.toLowerCase();
-	jQuery("a[href^='http']:not([href*='" + h + "']), a[href$='.pdf'], a[hrefjQuery$='.mp3'], a[href$='.m4a'], a[href$='.wav']").attr("target", "_blank");
 	
 	// External Links
-	jQuery("a[href^='http://']:not([href*='" + h + "'])").addClass("externalLink");
-	jQuery("a[href^='https://']:not([href*='" + h + "'])").addClass("externalLink");
-	jQuery("img").parent().removeClass("externalLink");
+	jQuery('[href^="http://"],[href^="https://"]').not('[href*="' + h + '"], .button, .menu-primary a').addClass('externalLink').attr("target", "_blank");
 
 	// Add classes to different types of media links
-	jQuery('a[href^="mailto:"]').addClass('emailLink');
-	jQuery('a[href*=".pdf"]').attr({"target":"_blank"}).addClass('pdfLink');
-	jQuery('a[href*=".doc"]').attr({"target":"_blank"}).addClass('docLink');
-	jQuery('img').parent('a').addClass('imageLink');
+	jQuery('a[href^="mailto:"]:not(.button)').addClass('emailLink');
+	jQuery('a[href*=".pdf"]:not(.button)').attr({"target":"_blank"}).addClass('pdfLink');
+	jQuery('a[href*=".doc"]:not(.button)').attr({"target":"_blank"}).addClass('docLink');
+	jQuery('img').parent('a:not(.button)').addClass('imageLink').removeClass('externalLink');
 
 	// Add classes to parts of lists
 	jQuery('li:last-child').addClass('last');
@@ -47,7 +45,7 @@ jQuery(document).ready(function() {
 }); /* end of as page load scripts */
 
 
-// executes when complete page is fully loaded, including all frames, objects and images
+// Executes when complete page is fully loaded, including all frames, objects, and images
 jQuery(window).load(function() {
 
 });
\ No newline at end of file
diff --git a/style.css b/style.css
index 3f08196..4aa2c11 100644
--- a/style.css
+++ b/style.css
@@ -381,11 +381,17 @@ input:hover[type="button"],
 input:hover[type="reset"],
 input:hover[type="submit"],
 .button:hover,
-.entry-content .button:hover {
+.entry-content .button:hover,
+.genesis-nav-menu input[type="submit"] {
 	background-color: #f15123;
 	border-color: #f15123;
 }
 
+.genesis-nav-menu input[type="submit"]:hover {
+	background-color: #555;
+	border-color: #555;
+}
+
 .entry-content .button:hover {
 	color: #fff;
 }
@@ -395,6 +401,16 @@ input:hover[type="submit"],
 	display: inline-block;
 }
 
+.arrow-right:after {
+	content: "\00a0\00a0\f0a9";
+	font-family: FontAwesome;
+}
+
+.arrow-left:before {
+	content: "\f0a9\00a0\00a0";
+	font-family: FontAwesome;
+}
+
 input[type="search"]::-webkit-search-cancel-button,
 input[type="search"]::-webkit-search-results-button {
 	display: none;
@@ -952,7 +968,8 @@ Site Navigation
 	display: inline-block;
 }
 
-.genesis-nav-menu a {
+.genesis-nav-menu a,
+.nav-primary .genesis-nav-menu > .right {
 	border: none;
 	color: #999;
 	display: block;
@@ -979,6 +996,18 @@ Site Navigation
 	text-transform: uppercase;
 }
 
+.genesis-nav-menu > .rss > a {
+	margin-right: 15px;
+	margin-right: 1.5rem;
+}
+
+.genesis-nav-menu > .search {
+	padding: 14px 0 0;
+	padding: 1.4rem 0 0;
+}
+
+
+/* Sub nav */
 .genesis-nav-menu .sub-menu,
 .genesis-nav-menu ul {
 	display: none;
@@ -1012,19 +1041,6 @@ Site Navigation
 	position: relative;
 }
 
-.genesis-nav-menu > .right {
-	display: none;
-}
-
-.genesis-nav-menu > .rss > a {
-	margin-left: 48px;
-	margin-left: 4.8rem;
-}
-
-.genesis-nav-menu > .search {
-	padding: 14px 0 0;
-	padding: 1.4rem 0 0;
-}
 
 /* Site Header Navigation
 --------------------------------------------- */
@@ -1061,7 +1077,8 @@ Site Navigation
 	display: block;
 }
 
-.nav-primary .genesis-nav-menu > li {
+.nav-primary .genesis-nav-menu > li,
+.nav-primary .genesis-nav-menu > .right {
 	border-top: 1px solid #444;
 }
 
@@ -1077,6 +1094,18 @@ Site Navigation
 	color: #fff;
 }
 
+/* Nav extras */
+.nav-primary .genesis-nav-menu > .right {
+	border-top-style: double;
+	border-width: 4px;
+}
+
+.nav-primary .genesis-nav-menu > .right > a {
+	display: inline;
+	padding: 0;
+}
+
+/* Sub menus */
 .nav-primary .genesis-nav-menu .sub-icon {
 	position: absolute;
 	z-index: 99;
@@ -1419,11 +1448,14 @@ Site Footer
 	color: #999;
 	font-size: 14px;
 	font-size: 1.4rem;
-	padding: 24px 0;
-	padding: 2.4rem 0;
 	text-align: center;
 }
 
+.site-footer .wrap {
+	padding: 20px;
+	padding: 2rem;
+}
+
 .site-footer a {
 	border-bottom: 1px solid #ddd;
 }
@@ -1690,11 +1722,43 @@ Media Queries
 		display: none;
 	}
 
-	.nav-primary .genesis-nav-menu a {
+	.nav-primary .genesis-nav-menu a,
+	.nav-primary .genesis-nav-menu > .right {
 		padding: 20px;
 		padding: 2rem;
 	}
 
+	/* Nav extras */
+	.nav-primary .genesis-nav-menu > .right {
+		display: inline-block;
+		float: right;
+		border-top: none;
+	}
+
+	.nav-primary .genesis-nav-menu > .rss > a {
+		margin: 0 0 0 20px;
+		margin: 0 0 0 2rem;
+	}
+
+	.nav-primary .genesis-nav-menu > .search {
+		padding: 11px 20px;
+		padding: 1.1rem 2rem;
+	}
+
+	.nav-primary .genesis-nav-menu > .search form {
+		padding-right: 0;
+	}
+	
+	.nav-primary .genesis-nav-menu > .search input {
+		padding: 10px 20px;
+		padding: 1rem 2rem;
+	}
+
+	.nav-primary .genesis-nav-menu > .search input[type="submit"] {
+		display: none;
+	}
+
+	/* Sub menus */
 	.nav-primary .genesis-nav-menu ul a,
 	.nav-primary .genesis-nav-menu ul ul a {
 		position: relative;