diff --git a/blueprint.sh b/blueprint.sh
index c2e75c5..b0ec9bb 100644
--- a/blueprint.sh
+++ b/blueprint.sh
@@ -592,8 +592,9 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then VCMD="y"
       eval "$(parse_yaml .blueprint/tmp/"$n"/"$dashboard_components"/components.yml comp_)"
       
       # assign variables to component items
-      extendNavigationBar="@/blueprint/extensions/${identifier}/${comp_extendNavigationBar}"
-      echo "${extendNavigationBar}"
+      extendNavigationBarItems="@/blueprint/extensions/${identifier}/${comp_extendNavigationBarItems}"
+
+      sed -i "s~""/* blueprint/import */""~""/* blueprint/import */import ${identifier}Component from '$extendNavigationBarItems';""~g"
 
     else
       # warn about missing components.yml file
@@ -814,11 +815,11 @@ if [[ ( $2 == "-i" ) || ( $2 == "-install" ) ]]; then VCMD="y"
   fi
 
   if [[ $YARN == "y" ]]; then 
-    if [[ ( ! $F_developerIgnoreRebuild ) || ( $dev != true ) ]]; then
+    if [[ ( $F_developerIgnoreRebuild ) && ( $dev == true ) ]]; then
+      log_yellow "[WARNING] Rebuilding skipped due to 'developerIgnoreRebuild' flag being present."
+    else
       log_bright "[INFO] Rebuilding panel.."
       yarn run build:production
-    else
-      log_yellow "[WARNING] Rebuilding skipped due to 'developerIgnoreRebuild' flag being present."
     fi
   fi
 
diff --git a/resources/scripts/blueprint/components/.gitkeep b/resources/scripts/blueprint/components/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/resources/scripts/blueprint/components/ExtendedNavigation.tsx b/resources/scripts/blueprint/components/NavigationBar/Items.tsx
similarity index 89%
rename from resources/scripts/blueprint/components/ExtendedNavigation.tsx
rename to resources/scripts/blueprint/components/NavigationBar/Items.tsx
index 7bf5d6f..63fe37b 100644
--- a/resources/scripts/blueprint/components/ExtendedNavigation.tsx
+++ b/resources/scripts/blueprint/components/NavigationBar/Items.tsx
@@ -2,6 +2,7 @@ import React from 'react';
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
 import { faPuzzlePiece } from '@fortawesome/free-solid-svg-icons';
 import Tooltip from '@/components/elements/tooltip/Tooltip';
+/* blueprint/import */
 
 export default () => {
   return (
@@ -11,6 +12,7 @@ export default () => {
           <FontAwesomeIcon icon={faPuzzlePiece} />
         </div>
       </Tooltip>
+      {/* blueprint/react */}
     </>
   );
 };
diff --git a/resources/scripts/components/NavigationBar.tsx b/resources/scripts/components/NavigationBar.tsx
index 48f36ab..01e78b4 100644
--- a/resources/scripts/components/NavigationBar.tsx
+++ b/resources/scripts/components/NavigationBar.tsx
@@ -12,7 +12,7 @@ import http from '@/api/http';
 import SpinnerOverlay from '@/components/elements/SpinnerOverlay';
 import Tooltip from '@/components/elements/tooltip/Tooltip';
 import Avatar from '@/components/Avatar';
-import ExtendedNavigation from '@/blueprint/components/ExtendedNavigation'; // blueprint/ExtendedNavigation
+import BlueprintNavigationItems from '@/blueprint/components/NavigationBar/Items';
 
 const RightNavigation = styled.div`
     & > a,
@@ -74,7 +74,7 @@ export default () => {
                             </a>
                         </Tooltip>
                     )}
-                    <ExtendedNavigation />
+                    <BlueprintNavigationItems />
                     <Tooltip placement={'bottom'} content={'Account Settings'}>
                         <NavLink to={'/account'}>
                             <span className={'flex items-center w-5 h-5'}>