diff --git a/public/index.html b/public/index.html
index dafb6af..045a009 100644
--- a/public/index.html
+++ b/public/index.html
@@ -71,17 +71,6 @@
 
         <div id="firmware-view" class="view-content">
             <div class="firmware-section">
-                <!--div class="firmware-header">
-                         <div class="firmware-header-left"></div>
-                         <button class="refresh-btn" onclick="refreshFirmwareView()">
-                             <svg class="refresh-icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2">
-                                 <path d="M1 4v6h6M23 20v-6h-6"/>
-                                 <path d="M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15"/>
-                             </svg>
-                             Refresh
-                         </button>
-                     </div-->
-
                 <div id="firmware-container">
                     <div class="firmware-overview">
                         <div class="firmware-actions">
@@ -147,12 +136,14 @@
     <script src="./scripts/framework.js"></script>
     <script src="./scripts/api-client.js"></script>
     <script src="./scripts/view-models.js"></script>
+    <!-- Base/leaf components first -->
     <script src="./scripts/components/PrimaryNodeComponent.js"></script>
-    <script src="./scripts/components/ClusterMembersComponent.js"></script>
     <script src="./scripts/components/NodeDetailsComponent.js"></script>
+    <script src="./scripts/components/ClusterMembersComponent.js"></script>
     <script src="./scripts/components/FirmwareComponent.js"></script>
-    <script src="./scripts/components/ClusterViewComponent.js"></script>
+    <!-- Container/view components after their deps -->
     <script src="./scripts/components/FirmwareViewComponent.js"></script>
+    <script src="./scripts/components/ClusterViewComponent.js"></script>
     <script src="./scripts/components/ClusterStatusComponent.js"></script>
     <script src="./scripts/components/TopologyGraphComponent.js"></script>
     <script src="./scripts/components/ComponentsLoader.js"></script>
diff --git a/public/scripts/components/FirmwareComponent.js b/public/scripts/components/FirmwareComponent.js
index 2f8c07b..6473125 100644
--- a/public/scripts/components/FirmwareComponent.js
+++ b/public/scripts/components/FirmwareComponent.js
@@ -432,7 +432,7 @@ class FirmwareComponent extends Component {
         const progressBar = this.findElement('#overall-progress-bar');
         const progressText = this.findElement('.progress-text');
         
-        if (progressBar and progressText) {
+        if (progressBar && progressText) {
             const successPercentage = Math.round((successfulUploads / totalNodes) * 100);
             progressBar.style.width = `${successPercentage}%`;
             progressText.textContent = `${successfulUploads}/${totalNodes} Successful (${successPercentage}%)`;
@@ -448,7 +448,7 @@ class FirmwareComponent extends Component {
             
             // Update progress summary for single-node uploads
             const progressSummary = this.findElement('#progress-summary');
-            if (progressSummary and totalNodes === 1) {
+            if (progressSummary && totalNodes === 1) {
                 if (successfulUploads === 1) {
                     progressSummary.innerHTML = '<span>Status: Upload completed successfully</span>';
                 } else if (successfulUploads === 0) {
@@ -462,7 +462,7 @@ class FirmwareComponent extends Component {
         const progressHeader = this.findElement('.progress-header h3');
         const progressSummary = this.findElement('#progress-summary');
         
-        if (progressHeader and progressSummary) {
+        if (progressHeader && progressSummary) {
             const successCount = results.filter(r => r.success).length;
             const totalCount = results.length;
             const successRate = Math.round((successCount / totalCount) * 100);