diff --git a/header.php b/header.php
index 2112490..164d213 100644
--- a/header.php
+++ b/header.php
@@ -43,28 +43,7 @@
 		<?php endif; ?>
 		
 		<div id="header-top" class="group">
-			
-			<div class="container group">
-				<div class="group pad">
-					<?php if ( get_theme_mod( 'header-social', 'on' ) == 'on' ): ?>
-						<?php featureon_social_links() ; ?>
-					<?php endif; ?>
-					<?php if ( get_theme_mod( 'header-search', 'on' ) == 'on' ): ?>
-						<div class="search-trap-focus">
-							<button class="toggle-search">
-								<svg class="svg-icon" id="svg-search" aria-hidden="true" role="img" focusable="false" xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><path d="M38.710696,48.0601792 L43,52.3494831 L41.3494831,54 L37.0601792,49.710696 C35.2632422,51.1481185 32.9839107,52.0076499 30.5038249,52.0076499 C24.7027226,52.0076499 20,47.3049272 20,41.5038249 C20,35.7027226 24.7027226,31 30.5038249,31 C36.3049272,31 41.0076499,35.7027226 41.0076499,41.5038249 C41.0076499,43.9839107 40.1481185,46.2632422 38.710696,48.0601792 Z M36.3875844,47.1716785 C37.8030221,45.7026647 38.6734666,43.7048964 38.6734666,41.5038249 C38.6734666,36.9918565 35.0157934,33.3341833 30.5038249,33.3341833 C25.9918565,33.3341833 22.3341833,36.9918565 22.3341833,41.5038249 C22.3341833,46.0157934 25.9918565,49.6734666 30.5038249,49.6734666 C32.7048964,49.6734666 34.7026647,48.8030221 36.1716785,47.3875844 C36.2023931,47.347638 36.2360451,47.3092237 36.2726343,47.2726343 C36.3092237,47.2360451 36.347638,47.2023931 36.3875844,47.1716785 Z" transform="translate(-20 -31)"></path></svg>
-								<svg class="svg-icon" id="svg-close" aria-hidden="true" role="img" focusable="false" xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 16 16"><polygon fill="" fill-rule="evenodd" points="6.852 7.649 .399 1.195 1.445 .149 7.899 6.602 14.352 .149 15.399 1.195 8.945 7.649 15.399 14.102 14.352 15.149 7.899 8.695 1.445 15.149 .399 14.102"></polygon></svg>
-							</button>
-							<div class="search-expand">
-								<div class="search-expand-inner">
-									<?php get_search_form(); ?>
-								</div>
-							</div>
-						</div>
-					<?php endif; ?>					
-				</div><!--/.pad-->
-			</div><!--/.container-->
-			
+		
 			<div class="container group">
 				<div class="group pad">
 					<?php echo featureon_site_title(); ?>
@@ -81,6 +60,23 @@
 					</div>
 				<?php endif; ?>
 				
+				<?php if ( get_theme_mod( 'header-social', 'on' ) == 'on' ): ?>
+					<?php featureon_social_links() ; ?>
+				<?php endif; ?>
+				<?php if ( get_theme_mod( 'header-search', 'on' ) == 'on' ): ?>
+					<div class="search-trap-focus">
+						<button class="toggle-search">
+							<svg class="svg-icon" id="svg-search" aria-hidden="true" role="img" focusable="false" xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 23 23"><path d="M38.710696,48.0601792 L43,52.3494831 L41.3494831,54 L37.0601792,49.710696 C35.2632422,51.1481185 32.9839107,52.0076499 30.5038249,52.0076499 C24.7027226,52.0076499 20,47.3049272 20,41.5038249 C20,35.7027226 24.7027226,31 30.5038249,31 C36.3049272,31 41.0076499,35.7027226 41.0076499,41.5038249 C41.0076499,43.9839107 40.1481185,46.2632422 38.710696,48.0601792 Z M36.3875844,47.1716785 C37.8030221,45.7026647 38.6734666,43.7048964 38.6734666,41.5038249 C38.6734666,36.9918565 35.0157934,33.3341833 30.5038249,33.3341833 C25.9918565,33.3341833 22.3341833,36.9918565 22.3341833,41.5038249 C22.3341833,46.0157934 25.9918565,49.6734666 30.5038249,49.6734666 C32.7048964,49.6734666 34.7026647,48.8030221 36.1716785,47.3875844 C36.2023931,47.347638 36.2360451,47.3092237 36.2726343,47.2726343 C36.3092237,47.2360451 36.347638,47.2023931 36.3875844,47.1716785 Z" transform="translate(-20 -31)"></path></svg>
+							<svg class="svg-icon" id="svg-close" aria-hidden="true" role="img" focusable="false" xmlns="http://www.w3.org/2000/svg" width="23" height="23" viewBox="0 0 16 16"><polygon fill="" fill-rule="evenodd" points="6.852 7.649 .399 1.195 1.445 .149 7.899 6.602 14.352 .149 15.399 1.195 8.945 7.649 15.399 14.102 14.352 15.149 7.899 8.695 1.445 15.149 .399 14.102"></polygon></svg>
+						</button>
+						<div class="search-expand">
+							<div class="search-expand-inner">
+								<?php get_search_form(); ?>
+							</div>
+						</div>
+					</div>
+				<?php endif; ?>	
+				
 			</div><!--/.container-->
 		
 		</div><!--/#header-top-->
diff --git a/readme.txt b/readme.txt
index 0e3d114..2ce5835 100644
--- a/readme.txt
+++ b/readme.txt
@@ -89,6 +89,10 @@ Subheader images
 
 == Changelog ==
 
+= 2.5.1 - 2022-08-25 =
+* Fixed underline links
+* Fixed header focus priority
+
 = 2.5.0 - 2022-08-25 =
 * Changed theme from premium to free
 
diff --git a/style.css b/style.css
index 407b6d8..7e64ab3 100644
--- a/style.css
+++ b/style.css
@@ -1,7 +1,7 @@
 /*
 Theme Name: Featureon
 Theme URI: http://alx.media/themes/featureon/
-Version: 2.5.0
+Version: 2.5.1
 Requires at least: 5.0
 Requires PHP: 5.6
 Tested up to: 6.0
@@ -234,6 +234,7 @@ input, textarea, button, select, label { font-family: inherit; }
 /* ------------------------------------ */
 .entry { font-size: 17px; line-height: 1.6em; }
 .entry.excerpt { font-size: 16px; color: #777; }
+.entry a { text-decoration: underline; }
 .entry p,
 .entry dd { margin-bottom: 1em; }
 .entry dt { color: #333; }
@@ -593,9 +594,9 @@ box-shadow: 0 1px 0 rgba(255,255,255,0.1); }
 .toggle-search .svg-icon { fill: #333; margin: 0 auto; }
 .toggle-search #svg-close { display: none; }
 .toggle-search.active #svg-search { display: none; }
-.toggle-search.active #svg-close { display: block; fill: rgba(0,0,0,0.4); }
+.toggle-search.active #svg-close { display: block; fill: rgba(0,0,0,0.6); }
 .toggle-search:focus #svg-search,
-.toggle-search:focus #svg-close { fill: rgba(0,0,0,0.6); }
+.toggle-search:focus #svg-close { fill: rgba(0,0,0,0.4); }
 
 
 /* ------------------------------------------------------------------------- *