diff --git a/blocks/attachment-info/attachment-info.php b/blocks/attachment-info/attachment-info.php
index 809f2ef94..514275604 100644
--- a/blocks/attachment-info/attachment-info.php
+++ b/blocks/attachment-info/attachment-info.php
@@ -33,24 +33,17 @@ public function init($loader = null) {
 		}
 	}
 
-	public function get_attachments($parent_post_id, $post_id = null) {
+	public function get_attachments($parent_post_id) {
 		$cached_data = false;
 		// $cached_data = wp_cache_get( $parent_post_id, 'attachment-info' );
 		if (false !== $cached_data) {
 			return $cached_data;
 		}
 
-		// check if this is an attachment page and if so get it's id...
-		$post__not_in = [];
-		if ( is_attachment($post_id) ) {
-			$post__not_in = [$post_id];
-		}
-
 		$attachments = new WP_Query( array(
 			'post_type' => 'attachment',
 			'post_parent' => $parent_post_id,
 			'post_status' => 'inherit',
-			'post__not_in' => $post__not_in,
 			'posts_per_page' => 50,
 			'orderby' => 'date',
 			'order' => 'asc',
@@ -88,15 +81,14 @@ public function get_attachments($parent_post_id, $post_id = null) {
 
 	public function render_block_callback( $attributes, $content, $block ) {
 		$post_id = $block->context['postId'];
-
 		$parent_post_id = wp_get_post_parent_id($post_id);
 
 		$heading_text = array_key_exists('heading', $attributes) ? $attributes['heading'] : false;
 
-		$attachments = $this->get_attachments($parent_post_id, $post_id);
+		$attachments = $this->get_attachments($parent_post_id);
 
-		$parent_post_title = get_the_title($parent_post_id);
-		$parent_post_url = get_the_permalink($parent_post_id);
+		$post_title = get_the_title($post_id);
+		$post_url = get_the_permalink($post_id);
 
 		if (! $attachments ) {
 			return '';
@@ -118,15 +110,15 @@ public function render_block_callback( $attributes, $content, $block ) {
 		);
 
 		$content .= wp_sprintf(
-			'<li class="%1$s"><a href="%2$s">%3$s</a></li>',
+			'<li class="%1$s"><a href="%2$s" target="_blank">%3$s</a></li>',
 			$list_item_classnames,
-			$parent_post_url,
-			$parent_post_title,
+			$post_url,
+			$post_title,
 		);
 
 		foreach ($attachments as $attachment) {
 			$content .= wp_sprintf(
-				'<li class="%1$s"><a href="%2$s">%3$s</a></li>',
+				'<li class="%1$s"><a href="%2$s" target="_blank">%3$s</a></li>',
 				$list_item_classnames,
 				$attachment['link'],
 				$attachment['title'],
diff --git a/blocks/navigation-mega-menu/build/style-index.css b/blocks/navigation-mega-menu/build/style-index.css
index eda437599..48067565f 100644
--- a/blocks/navigation-mega-menu/build/style-index.css
+++ b/blocks/navigation-mega-menu/build/style-index.css
@@ -1 +1 @@
-.wp-block-prc-block-navigation-mega-menu{border-left:1px solid #0000;border-right:1px solid #0000;border-top:1px solid #0000;flex-direction:column}.wp-block-prc-block-navigation-mega-menu.is-active{border-left-color:var(--active-border-color);border-right-color:var(--active-border-color);border-top-color:var(--active-border-color)}.wp-block-prc-block-navigation-mega-menu.is-active .wp-block-prc-block-navigation-mega-menu__tab-divider{background-color:var(--overlay-background-color)}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__tab-divider{background-color:#0000;height:1px;position:relative;top:1px;width:100%;z-index:4}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle{background-color:initial;border:none;border-bottom:1px solid #0000;color:currentColor;cursor:pointer;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;letter-spacing:inherit;line-height:inherit;padding:0;position:relative;text-align:left;text-transform:inherit;top:0;z-index:3}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-dropdown-icon,.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-mobile-icon,.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-search-icon{align-self:center;display:inline-block;font-size:inherit;padding:0;width:.6em}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-dropdown-icon{font-size:14px;margin-left:.25em}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-dropdown-icon i{position:relative;top:-1px}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-dropdown-icon>*,.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-mobile-icon>*{display:inline-block;transition:all .1s linear}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle:hover{background-color:#0000}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle[aria-expanded=true] .wp-block-prc-block-navigation-mega-menu__toggle-dropdown-icon>*{transform:rotate(-180deg)}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle[aria-expanded=true] .wp-block-prc-block-navigation-mega-menu__toggle-mobile-icon>*{transform:rotate(-90deg)}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle[aria-expanded=true]~.wp-block-prc-block-navigation-mega-menu__container{opacity:1;overflow:visible;visibility:visible}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__container{background:inherit;border-bottom:1px solid var(--active-border-color);border-top:1px solid var(--active-border-color);height:auto;left:0;max-width:100vw;opacity:0;overflow:hidden;position:absolute;transition:opacity .1s linear;visibility:hidden;width:100vw;z-index:2}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__container .wp-block-prc-block-navigation-mega-menu__container__close-button{align-items:center;appearance:none;-webkit-appearance:none;background-color:#0000;border:none;cursor:pointer;display:flex;justify-content:center;opacity:0;padding:4px;position:absolute;right:2em;text-align:center;top:1em;transition:opacity .2s ease;z-index:100}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__container .wp-block-prc-block-navigation-mega-menu__container__close-button:focus,.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__container:hover .wp-block-prc-block-navigation-mega-menu__container__close-button{opacity:1}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__container .is-responsive{display:flex}
+.wp-block-prc-block-navigation-mega-menu{border-left:1px solid #0000;border-right:1px solid #0000;border-top:1px solid #0000;flex-direction:column}.wp-block-prc-block-navigation-mega-menu.is-active{border-left-color:var(--active-border-color);border-right-color:var(--active-border-color);border-top-color:var(--active-border-color)}.wp-block-prc-block-navigation-mega-menu.is-active .wp-block-prc-block-navigation-mega-menu__tab-divider{background-color:var(--overlay-background-color)}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__tab-divider{background-color:#0000;height:1px;position:relative;top:1px;width:100%;z-index:4}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle{background-color:initial;border:none;border-bottom:1px solid #0000;color:currentColor;cursor:pointer;font-family:inherit;font-size:inherit;font-style:inherit;font-weight:inherit;letter-spacing:inherit;line-height:inherit;padding:0;position:relative;text-align:left;text-transform:inherit;top:0;z-index:3}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-dropdown-icon,.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-mobile-icon,.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-search-icon{align-self:center;display:inline-block;font-size:inherit;padding:0;width:.6em}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-dropdown-icon{font-size:14px;margin-left:.25em}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-dropdown-icon i{position:relative;top:-1px}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-dropdown-icon>*,.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle .wp-block-prc-block-navigation-mega-menu__toggle-mobile-icon>*{display:inline-block;transition:all .1s linear}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle:hover{background-color:#0000}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle[aria-expanded=true] .wp-block-prc-block-navigation-mega-menu__toggle-dropdown-icon>*{transform:rotate(-180deg)}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle[aria-expanded=true] .wp-block-prc-block-navigation-mega-menu__toggle-mobile-icon>*{transform:rotate(-90deg)}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__toggle[aria-expanded=true]~.wp-block-prc-block-navigation-mega-menu__container{opacity:1;overflow:visible;visibility:visible}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__container{background:inherit;border-bottom:1px solid var(--active-border-color);border-top-width:0;height:auto;left:0;max-width:100vw;opacity:0;overflow:hidden;position:absolute;transition:opacity .1s linear;visibility:hidden;width:100vw;z-index:2}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__container .wp-block-prc-block-navigation-mega-menu__container__close-button{align-items:center;appearance:none;-webkit-appearance:none;background-color:#0000;border:none;cursor:pointer;display:flex;justify-content:center;opacity:0;padding:4px;position:absolute;right:2em;text-align:center;top:1em;transition:opacity .2s ease;z-index:100}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__container .wp-block-prc-block-navigation-mega-menu__container__close-button:focus,.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__container:hover .wp-block-prc-block-navigation-mega-menu__container__close-button{opacity:1}.wp-block-prc-block-navigation-mega-menu .wp-block-prc-block-navigation-mega-menu__container .is-responsive{display:flex}
diff --git a/blocks/navigation-mega-menu/src/style.scss b/blocks/navigation-mega-menu/src/style.scss
index 2dc80ef4e..a20cd8682 100644
--- a/blocks/navigation-mega-menu/src/style.scss
+++ b/blocks/navigation-mega-menu/src/style.scss
@@ -103,9 +103,7 @@
 		border-bottom-width: 1px;
 		border-bottom-color: var(--active-border-color);
 		border-bottom-style: solid;
-		border-top-width: 1px;
-		border-top-color: var(--active-border-color);
-		border-top-style: solid;
+		border-top-width: 0px;
 		max-width: 100vw;
 		width: 100vw;