diff --git a/app.py b/app.py
index 7f12fab..47cf523 100644
--- a/app.py
+++ b/app.py
@@ -299,7 +299,17 @@ def create_results_structure(tournament_data):
         return None
     
     tournament_type = tournament_data.get('tournament_type', '20_targets')
-    num_targets = 40 if tournament_type == '40_targets' else 20
+    
+    # Determine target count and shots per target
+    if tournament_type == '40_targets':
+        num_targets = 40
+        shots_per_target = 2
+    elif tournament_type == '4_targets':
+        num_targets = 4
+        shots_per_target = 5
+    else:  # 20_targets (default)
+        num_targets = 20
+        shots_per_target = 2
     
     results = {
         'tournament_id': tournament_data.get('created_at', datetime.now().isoformat()),
@@ -320,9 +330,18 @@ def create_results_structure(tournament_data):
     
     for player in all_players:
         player_id = str(player['id'])
+        
+        # Create target structure based on tournament type
+        targets = {}
+        for i in range(1, num_targets + 1):
+            target = {}
+            for j in range(1, shots_per_target + 1):
+                target[f'shot{j}'] = None
+            targets[str(i)] = target
+        
         results['participants'][player_id] = {
             'name': player['name'],
-            'targets': {str(i): {'shot1': None, 'shot2': None} for i in range(1, num_targets + 1)},
+            'targets': targets,
             'total_score': 0,
             'completed': False
         }
@@ -333,19 +352,17 @@ def calculate_total_score(targets):
     """Calculate total score from targets, treating None as 0"""
     total = 0
     for target in targets.values():
-        shot1 = target.get('shot1')
-        shot2 = target.get('shot2')
-        total += (shot1 if shot1 is not None else 0)
-        total += (shot2 if shot2 is not None else 0)
+        for shot_key, shot_value in target.items():
+            if shot_key.startswith('shot') and shot_value is not None:
+                total += shot_value
     return total
 
 def is_participant_completed(targets):
     """Check if a participant has completed all targets (all shots entered, including 0s)"""
     for target in targets.values():
-        shot1 = target.get('shot1')
-        shot2 = target.get('shot2')
-        if shot1 is None or shot2 is None:
-            return False
+        for shot_key, shot_value in target.items():
+            if shot_key.startswith('shot') and shot_value is None:
+                return False
     return True
 
 def calculate_league_final_scores(league_data):
@@ -749,6 +766,8 @@ def get_all_players_from_archives():
     
     return players_list
 
+
+
 # Add these routes after the existing routes in app.py
 
 # Add this to your app.py file to integrate the modern archive system
@@ -875,15 +894,17 @@ def api_get_archive_stats():
             'leagues': [1, 1, 2, 1, 2, 1]
         }
         
-        # Calculate tournament type distribution
-        type_distribution = {'20_targets': 0, '40_targets': 0}
+        # Calculate tournament type distribution - now includes 4_targets
+        type_distribution = {'20_targets': 0, '40_targets': 0, '4_targets': 0}
         for tournament in tournaments:
             tournament_type = tournament.get('tournament_type', '20_targets')
-            type_distribution[tournament_type] += 1
+            if tournament_type in type_distribution:
+                type_distribution[tournament_type] += 1
         
         for league in leagues:
             league_type = league.get('tournament_type', '20_targets')
-            type_distribution[league_type] += 1
+            if league_type in type_distribution:
+                type_distribution[league_type] += 1
         
         stats = {
             'overview': {
@@ -894,15 +915,14 @@ def api_get_archive_stats():
             },
             'activity_data': activity_data,
             'type_distribution': {
-                'labels': ['20 Targets', '40 Targets'],
-                'data': [type_distribution['20_targets'], type_distribution['40_targets']]
+                'labels': ['20 Targets', '40 Targets', '4 Targets'],
+                'data': [type_distribution['20_targets'], type_distribution['40_targets'], type_distribution['4_targets']]
             }
         }
         
         return jsonify({'status': 'success', 'stats': stats})
     except Exception as e:
         return jsonify({'status': 'error', 'message': str(e)}), 500
-
 @app.route('/api/archive/player/<int:player_id>/performance', methods=['GET'])
 def api_get_player_performance(player_id):
     """API endpoint to get player performance data for charts"""
@@ -1629,10 +1649,9 @@ def start_league():
     try:
         data = request.get_json()
         tournament_type = data.get('tournament_type', '20_targets')
-        
-        if tournament_type not in ['20_targets', '40_targets']:
+        if tournament_type not in ['20_targets', '40_targets', '4_targets']:
             return jsonify({'status': 'error', 'message': 'Invalid tournament type'}), 400
-        
+
         players_data = load_players()
         enabled_players = [p for p in players_data['players'] if p['enabled']]
         
@@ -1741,7 +1760,7 @@ def start_tournament():
         data = request.get_json() or {}
         tournament_type = data.get('tournament_type', '20_targets')
         
-        if tournament_type not in ['20_targets', '40_targets']:
+        if tournament_type not in ['20_targets', '40_targets', '4_targets']:
             return jsonify({'status': 'error', 'message': 'Invalid tournament type'}), 400
         
         players_data = load_players()
@@ -1869,6 +1888,13 @@ def finish_tournament():
         results['tournament_finished'] = True
         results['finished_at'] = datetime.now().isoformat()
         
+        # Define total shots per participant for each tournament type
+        total_shots_per_participant = {
+            '20_targets': 40,  # 20 targets × 2 shots
+            '40_targets': 80,  # 40 targets × 2 shots  
+            '4_targets': 20    # 4 targets × 5 shots
+        }
+        
         league_finished = False  # Track if league finished
         
         # Update league state if this is a league tournament
@@ -1901,13 +1927,21 @@ def finish_tournament():
                         'joker': True
                     })
             
+            # Calculate total shots correctly for any tournament type
+            tournament_type = results.get('tournament_type', '20_targets')
+            shots_per_participant = total_shots_per_participant.get(tournament_type, 40)
+            total_shots_fired = len(results['participants']) * shots_per_participant
+            
             # Add to completed tournaments
             league_state['completed_tournaments'].append({
                 'tournament_number': tournament_number,
+                'tournament_type': tournament_type,
                 'finished_at': datetime.now().isoformat(),
                 'results_summary': {
                     'participants': len(results['participants']),
-                    'total_shots': len(results['participants']) * (40 if results.get('tournament_type') == '40_targets' else 20) * 2
+                    'shots_per_participant': shots_per_participant,
+                    'total_shots': total_shots_fired,
+                    'format_description': get_tournament_format_description(tournament_type)
                 }
             })
             
@@ -1920,7 +1954,7 @@ def finish_tournament():
                 calculate_league_final_scores(league_state)
                 
                 league_finished = True
-                print("League finished!")
+                print(f"League finished! Final tournament was {tournament_type} format.")
             
             save_league_state(league_state)
         
@@ -1928,9 +1962,11 @@ def finish_tournament():
         archive_success = False
         if not league_state:  # Only archive standalone tournaments
             archive_success = archive_tournament(tournament_state, results)
-            print(f"Standalone tournament archived: {archive_success}")
+            tournament_type = results.get('tournament_type', '20_targets')
+            print(f"Standalone {tournament_type} tournament archived: {archive_success}")
         else:
-            print("League tournament - not archiving individual tournament")
+            tournament_type = results.get('tournament_type', '20_targets')
+            print(f"League {tournament_type} tournament - not archiving individual tournament")
         
         # Archive the league if it just finished
         league_archive_success = False
@@ -1952,7 +1988,9 @@ def finish_tournament():
                 'status': 'success', 
                 'results': results,
                 'archived': archive_success,
-                'league_archived': league_archive_success if league_finished else None
+                'league_archived': league_archive_success if league_finished else None,
+                'tournament_type': results.get('tournament_type', '20_targets'),
+                'tournament_format': get_tournament_format_description(results.get('tournament_type', '20_targets'))
             }
             
             if league_state:
@@ -1967,6 +2005,15 @@ def finish_tournament():
         print(f"Error finishing tournament: {e}")
         return jsonify({'status': 'error', 'message': str(e)}), 400
 
+
+def get_tournament_format_description(tournament_type):
+    """Get human-readable description of tournament format"""
+    format_descriptions = {
+        '20_targets': '20 Targets (2 shots each)',
+        '40_targets': '40 Targets (2 shots each)',
+        '4_targets': '4 Targets (5 shots each)'
+    }
+    return format_descriptions.get(tournament_type, '20 Targets (2 shots each)')
 @app.route('/api/results', methods=['GET'])
 def get_results():
     """API endpoint to get current results"""
@@ -2115,5 +2162,7 @@ def get_camera_titles():
     except Exception as e:
         return jsonify({'status': 'error', 'message': str(e)}), 400
 
+
+
 if __name__ == '__main__':
     app.run(host='0.0.0.0', port=5000, debug=True)
\ No newline at end of file
diff --git a/templates/modern_archive_index.html b/templates/modern_archive_index.html
index dd05a5e..97b138f 100644
--- a/templates/modern_archive_index.html
+++ b/templates/modern_archive_index.html
@@ -137,9 +137,42 @@
       margin-bottom: 15px;
       border-bottom: 3px solid #007bff;
       padding-bottom: 5px;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
     }
 
-    /* Compact Stats Overview */
+    .section-controls {
+      display: flex;
+      gap: 10px;
+      align-items: center;
+    }
+
+    .filter-btn {
+      background: #f8f9fa;
+      border: 1px solid #dee2e6;
+      padding: 6px 12px;
+      border-radius: 6px;
+      cursor: pointer;
+      font-size: 0.8rem;
+      transition: all 0.2s ease;
+    }
+
+    .filter-btn.active {
+      background: #007bff;
+      color: white;
+      border-color: #007bff;
+    }
+
+    .filter-btn:hover {
+      background: #e9ecef;
+    }
+
+    .filter-btn.active:hover {
+      background: #0056b3;
+    }
+
+    /* Enhanced Stats Overview */
     .stats-overview {
       display: grid;
       grid-template-columns: repeat(auto-fit, minmax(180px, 1fr));
@@ -181,7 +214,20 @@
       text-transform: uppercase;
     }
 
-    /* Compact Archive Grid */
+    /* Target-specific stat cards */
+    .stat-card.target-40 {
+      border-left: 4px solid #dc3545;
+    }
+
+    .stat-card.target-20 {
+      border-left: 4px solid #ffc107;
+    }
+
+    .stat-card.target-4 {
+      border-left: 4px solid #28a745;
+    }
+
+    /* Enhanced Archive Grid */
     .archive-grid {
       display: grid;
       grid-template-columns: repeat(auto-fit, minmax(320px, 1fr));
@@ -221,6 +267,22 @@
       background: #fff3cd;
     }
 
+    .archive-card.tournament-40 .archive-header {
+      background: #f8d7da;
+    }
+
+    .archive-card.tournament-20 .archive-header {
+      background: #fff3cd;
+    }
+
+    .archive-card.tournament-4 .archive-header {
+      background: #d1edff;
+    }
+
+    .archive-card.tournament-other .archive-header {
+      background: #f8f9fa;
+    }
+
     .archive-title {
       font-size: 1.2rem;
       font-weight: bold;
@@ -251,6 +313,21 @@
       color: #856404;
     }
 
+    .badge-40-targets {
+      background: #dc3545;
+      color: white;
+    }
+
+    .badge-20-targets {
+      background: #ffc107;
+      color: #856404;
+    }
+
+    .badge-4-targets {
+      background: #17a2b8;
+      color: white;
+    }
+
     .archive-content {
       padding: 15px 20px;
     }
@@ -283,23 +360,28 @@
       display: flex;
       justify-content: space-between;
       align-items: center;
-      gap: 10px;
+      gap: 8px;
       padding-top: 12px;
       border-top: 1px solid #f0f0f0;
     }
 
-    .view-btn {
-      background: #007bff;
+    .action-btn {
       border: none;
-      color: white;
-      padding: 8px 16px;
+      padding: 8px 12px;
       border-radius: 6px;
       cursor: pointer;
-      font-size: 0.85rem;
+      font-size: 0.8rem;
       font-weight: bold;
       transition: all 0.2s ease;
       text-decoration: none;
       display: inline-block;
+      text-align: center;
+    }
+
+    .view-btn {
+      background: #007bff;
+      color: white;
+      flex: 1;
     }
 
     .view-btn:hover {
@@ -307,16 +389,18 @@
       transform: translateY(-1px);
     }
 
+    .edit-btn {
+      background: #28a745;
+      color: white;
+    }
+
+    .edit-btn:hover {
+      background: #1e7e34;
+    }
+
     .delete-btn {
       background: #dc3545;
-      border: none;
       color: white;
-      padding: 6px 12px;
-      border-radius: 6px;
-      cursor: pointer;
-      font-size: 0.75rem;
-      font-weight: bold;
-      transition: all 0.2s ease;
     }
 
     .delete-btn:hover {
@@ -342,7 +426,7 @@
       opacity: 0.5;
     }
 
-    /* Confirmation Modal */
+    /* Modal Styles */
     .modal-overlay {
       position: fixed;
       top: 0;
@@ -364,18 +448,20 @@
       visibility: visible;
     }
 
-    .confirmation-modal {
+    .modal {
       background: white;
       border-radius: 8px;
       padding: 20px;
-      max-width: 400px;
+      max-width: 500px;
       width: 90%;
+      max-height: 80vh;
+      overflow-y: auto;
       box-shadow: 0 4px 12px rgba(0, 0, 0, 0.3);
       transform: scale(0.9);
       transition: transform 0.2s ease;
     }
 
-    .modal-overlay.active .confirmation-modal {
+    .modal-overlay.active .modal {
       transform: scale(1);
     }
 
@@ -383,7 +469,7 @@
       font-size: 1.1rem;
       font-weight: bold;
       color: #333;
-      margin-bottom: 10px;
+      margin-bottom: 15px;
     }
 
     .modal-message {
@@ -396,6 +482,7 @@
       display: flex;
       gap: 10px;
       justify-content: flex-end;
+      margin-top: 20px;
     }
 
     .modal-btn {
@@ -425,6 +512,64 @@
       background: #c82333;
     }
 
+    .modal-btn.primary {
+      background: #007bff;
+      color: white;
+    }
+
+    .modal-btn.primary:hover {
+      background: #0056b3;
+    }
+
+    /* Edit Form Styles */
+    .edit-form {
+      display: flex;
+      flex-direction: column;
+      gap: 15px;
+    }
+
+    .form-group {
+      display: flex;
+      flex-direction: column;
+      gap: 5px;
+    }
+
+    .form-label {
+      font-weight: bold;
+      color: #333;
+      font-size: 0.9rem;
+    }
+
+    .form-input {
+      padding: 8px 12px;
+      border: 1px solid #ddd;
+      border-radius: 4px;
+      font-size: 0.9rem;
+    }
+
+    .form-input:focus {
+      outline: none;
+      border-color: #007bff;
+    }
+
+    .form-select {
+      padding: 8px 12px;
+      border: 1px solid #ddd;
+      border-radius: 4px;
+      font-size: 0.9rem;
+      background: white;
+    }
+
+    .form-select:focus {
+      outline: none;
+      border-color: #007bff;
+    }
+
+    /* Hidden class for filtering */
+    .hidden {
+      display: none !important;
+    }
+
     /* Mobile responsive */
     @media (max-width: 768px) {
       .navbar {
@@ -468,9 +613,19 @@
         gap: 8px;
       }
 
-      .view-btn {
+      .action-btn {
         text-align: center;
       }
+
+      .section-title {
+        flex-direction: column;
+        align-items: flex-start;
+        gap: 10px;
+      }
+
+      .section-controls {
+        flex-wrap: wrap;
+      }
     }
   </style>
 </head>
@@ -485,37 +640,54 @@
   </div>
 
   <div class="container">
-    <!-- Stats Overview -->
+    <!-- Enhanced Stats Overview -->
     <div class="stats-overview">
-      <div class="stat-card">
-        <span class="stat-icon">🏆</span>
-        <div class="stat-value">{{ stats.total_tournaments }}</div>
-        <div class="stat-label">Standalone Tournaments</div>
-      </div>
       <div class="stat-card">
         <span class="stat-icon">🎖️</span>
-        <div class="stat-value">{{ stats.total_leagues }}</div>
+        <div class="stat-value">{{ leagues|length if leagues else 0 }}</div>
         <div class="stat-label">Completed Leagues</div>
       </div>
       <div class="stat-card">
-        <span class="stat-icon">👥</span>
-        <div class="stat-value">{{ stats.total_players }}</div>
-        <div class="stat-label">Active Players</div>
+        <span class="stat-icon">🏆</span>
+        <div class="stat-value">{{ tournaments|length if tournaments else 0 }}</div>
+        <div class="stat-label">Total Tournaments</div>
+      </div>
+      <div class="stat-card target-40">
+        <span class="stat-icon">🎯</span>
+        <div class="stat-value">{{ tournaments|selectattr('tournament_type', 'equalto', '40_targets')|list|length if tournaments else 0 }}</div>
+        <div class="stat-label">40-Target Tournaments</div>
+      </div>
+      <div class="stat-card target-20">
+        <span class="stat-icon">🏹</span>
+        <div class="stat-value">{{ tournaments|selectattr('tournament_type', 'equalto', '20_targets')|list|length if tournaments else 0 }}</div>
+        <div class="stat-label">20-Target Tournaments</div>
+      </div>
+      <div class="stat-card target-4">
+        <span class="stat-icon">🎪</span>
+        <div class="stat-value">{{ tournaments|selectattr('tournament_type', 'equalto', '4_targets')|list|length if tournaments else 0 }}</div>
+        <div class="stat-label">4-Target Tournaments</div>
       </div>
       <div class="stat-card">
-        <span class="stat-icon">📊</span>
-        <div class="stat-value">{{ stats.total_matches }}</div>
-        <div class="stat-label">Total Competitions</div>
+        <span class="stat-icon">👥</span>
+        <div class="stat-value">{{ stats.total_players if stats else 0 }}</div>
+        <div class="stat-label">Active Players</div>
       </div>
     </div>
 
     <!-- Leagues Section -->
     {% if leagues %}
     <div class="section">
-      <h2 class="section-title">🎖️ League Championships</h2>
-      <div class="archive-grid">
+      <div class="section-title">
+        <span>🎖️ League Championships</span>
+        <div class="section-controls">
+          <button class="filter-btn active" onclick="filterLeagues('all')">All</button>
+          <button class="filter-btn" onclick="filterLeagues('completed')">Completed</button>
+          <button class="filter-btn" onclick="filterLeagues('recent')">Recent</button>
+        </div>
+      </div>
+      <div class="archive-grid" id="leagues-grid">
         {% for league in leagues %}
-        <div class="archive-card league" onclick="viewLeague('{{ league.filename }}')">
+        <div class="archive-card league" data-status="{{ 'completed' if league.completed_tournaments == league.total_tournaments else 'incomplete' }}" data-date="{{ league.archived_at }}" onclick="viewLeague('{{ league.filename }}')">
           <div class="archive-header">
             <div>
               <div class="archive-title">League Championship</div>
@@ -543,9 +715,12 @@
               </div>
             </div>
             <div class="archive-actions">
-              <a href="/archive/league/{{ league.filename }}" class="view-btn">🏆 View Results</a>
-              <button class="delete-btn" onclick="event.stopPropagation(); deleteArchive('league', '{{ league.filename }}')">
-                🗑️ Delete
+              <a href="/archive/league/{{ league.filename }}" class="action-btn view-btn">🏆 View</a>
+              <button class="action-btn edit-btn" onclick="event.stopPropagation(); editArchive('league', '{{ league.filename }}', {{ league|tojson }})">
+                ✏️ Edit
+              </button>
+              <button class="action-btn delete-btn" onclick="event.stopPropagation(); deleteArchive('league', '{{ league.filename }}')">
+                🗑️
               </button>
             </div>
           </div>
@@ -555,16 +730,198 @@
     </div>
     {% endif %}
 
-    <!-- Standalone Tournaments Section -->
+    <!-- Tournaments Section - Organized by Target Count -->
     {% if tournaments %}
+    
+    <!-- 40-Target Tournaments -->
+    {% set tournaments_40 = tournaments|selectattr('tournament_type', 'equalto', '40_targets')|list %}
+    {% if tournaments_40 %}
     <div class="section">
-      <h2 class="section-title">🏆 Standalone Tournaments</h2>
-      <div class="archive-grid">
-        {% for tournament in tournaments %}
-        <div class="archive-card tournament" onclick="viewTournament('{{ tournament.filename }}')">
+      <div class="section-title">
+        <span>🎯 40-Target Tournaments</span>
+        <div class="section-controls">
+          <button class="filter-btn active" onclick="filterTournaments('40', 'all')">All</button>
+          <button class="filter-btn" onclick="filterTournaments('40', 'finished')">Finished</button>
+          <button class="filter-btn" onclick="filterTournaments('40', 'recent')">Recent</button>
+        </div>
+      </div>
+      <div class="archive-grid" id="tournaments-40-grid">
+        {% for tournament in tournaments_40 %}
+        <div class="archive-card tournament-40" data-status="{{ 'finished' if tournament.tournament_finished else 'incomplete' }}" data-date="{{ tournament.archived_at }}" data-targets="40" onclick="viewTournament('{{ tournament.filename }}')">
           <div class="archive-header">
             <div>
-              <div class="archive-title">Single Tournament</div>
+              <div class="archive-title">40-Target Tournament</div>
+              <div class="archive-subtitle">{{ tournament.created_at[:10] if tournament.created_at != 'Unknown' else 'Unknown Date' }}</div>
+            </div>
+            <span class="archive-badge badge-40-targets">40 Targets</span>
+          </div>
+          <div class="archive-content">
+            <div class="archive-info">
+              <div class="info-item">
+                <span class="info-icon">👥</span>
+                <span class="info-value">{{ tournament.participants_count }} players</span>
+              </div>
+              <div class="info-item">
+                <span class="info-icon">🎯</span>
+                <span class="info-value">{{ tournament.tournament_type.replace('_', ' ')|title }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-icon">📅</span>
+                <span class="info-value">{{ tournament.archived_at[:10] if tournament.archived_at != 'Unknown' else 'Unknown Date' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-icon">🏁</span>
+                <span class="info-value">{{ 'Finished' if tournament.tournament_finished else 'Incomplete' }}</span>
+              </div>
+            </div>
+            <div class="archive-actions">
+              <a href="/archive/tournament/{{ tournament.filename }}" class="action-btn view-btn">📊 View</a>
+              <button class="action-btn edit-btn" onclick="event.stopPropagation(); editArchive('tournament', '{{ tournament.filename }}', {{ tournament|tojson }})">
+                ✏️ Edit
+              </button>
+              <button class="action-btn delete-btn" onclick="event.stopPropagation(); deleteArchive('tournament', '{{ tournament.filename }}')">
+                🗑️
+              </button>
+            </div>
+          </div>
+        </div>
+        {% endfor %}
+      </div>
+    </div>
+    {% endif %}
+
+    <!-- 20-Target Tournaments -->
+    {% set tournaments_20 = tournaments|selectattr('tournament_type', 'equalto', '20_targets')|list %}
+    {% if tournaments_20 %}
+    <div class="section">
+      <div class="section-title">
+        <span>🏹 20-Target Tournaments</span>
+        <div class="section-controls">
+          <button class="filter-btn active" onclick="filterTournaments('20', 'all')">All</button>
+          <button class="filter-btn" onclick="filterTournaments('20', 'finished')">Finished</button>
+          <button class="filter-btn" onclick="filterTournaments('20', 'recent')">Recent</button>
+        </div>
+      </div>
+      <div class="archive-grid" id="tournaments-20-grid">
+        {% for tournament in tournaments_20 %}
+        <div class="archive-card tournament-20" data-status="{{ 'finished' if tournament.tournament_finished else 'incomplete' }}" data-date="{{ tournament.archived_at }}" data-targets="20" onclick="viewTournament('{{ tournament.filename }}')">
+          <div class="archive-header">
+            <div>
+              <div class="archive-title">20-Target Tournament</div>
+              <div class="archive-subtitle">{{ tournament.created_at[:10] if tournament.created_at != 'Unknown' else 'Unknown Date' }}</div>
+            </div>
+            <span class="archive-badge badge-20-targets">20 Targets</span>
+          </div>
+          <div class="archive-content">
+            <div class="archive-info">
+              <div class="info-item">
+                <span class="info-icon">👥</span>
+                <span class="info-value">{{ tournament.participants_count }} players</span>
+              </div>
+              <div class="info-item">
+                <span class="info-icon">🎯</span>
+                <span class="info-value">{{ tournament.tournament_type.replace('_', ' ')|title }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-icon">📅</span>
+                <span class="info-value">{{ tournament.archived_at[:10] if tournament.archived_at != 'Unknown' else 'Unknown Date' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-icon">🏁</span>
+                <span class="info-value">{{ 'Finished' if tournament.tournament_finished else 'Incomplete' }}</span>
+              </div>
+            </div>
+            <div class="archive-actions">
+              <a href="/archive/tournament/{{ tournament.filename }}" class="action-btn view-btn">📊 View</a>
+              <button class="action-btn edit-btn" onclick="event.stopPropagation(); editArchive('tournament', '{{ tournament.filename }}', {{ tournament|tojson }})">
+                ✏️ Edit
+              </button>
+              <button class="action-btn delete-btn" onclick="event.stopPropagation(); deleteArchive('tournament', '{{ tournament.filename }}')">
+                🗑️
+              </button>
+            </div>
+          </div>
+        </div>
+        {% endfor %}
+      </div>
+    </div>
+    {% endif %}
+
+    <!-- 4-Target Tournaments -->
+    {% set tournaments_4 = tournaments|selectattr('tournament_type', 'equalto', '4_targets')|list %}
+    {% if tournaments_4 %}
+    <div class="section">
+      <div class="section-title">
+        <span>🎪 4-Target Tournaments</span>
+        <div class="section-controls">
+          <button class="filter-btn active" onclick="filterTournaments('4', 'all')">All</button>
+          <button class="filter-btn" onclick="filterTournaments('4', 'finished')">Finished</button>
+          <button class="filter-btn" onclick="filterTournaments('4', 'recent')">Recent</button>
+        </div>
+      </div>
+      <div class="archive-grid" id="tournaments-4-grid">
+        {% for tournament in tournaments_4 %}
+        <div class="archive-card tournament-4" data-status="{{ 'finished' if tournament.tournament_finished else 'incomplete' }}" data-date="{{ tournament.archived_at }}" data-targets="4" onclick="viewTournament('{{ tournament.filename }}')">
+          <div class="archive-header">
+            <div>
+              <div class="archive-title">4-Target Tournament</div>
+              <div class="archive-subtitle">{{ tournament.created_at[:10] if tournament.created_at != 'Unknown' else 'Unknown Date' }}</div>
+            </div>
+            <span class="archive-badge badge-4-targets">4 Targets</span>
+          </div>
+          <div class="archive-content">
+            <div class="archive-info">
+              <div class="info-item">
+                <span class="info-icon">👥</span>
+                <span class="info-value">{{ tournament.participants_count }} players</span>
+              </div>
+              <div class="info-item">
+                <span class="info-icon">🎯</span>
+                <span class="info-value">{{ tournament.tournament_type.replace('_', ' ')|title }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-icon">📅</span>
+                <span class="info-value">{{ tournament.archived_at[:10] if tournament.archived_at != 'Unknown' else 'Unknown Date' }}</span>
+              </div>
+              <div class="info-item">
+                <span class="info-icon">🏁</span>
+                <span class="info-value">{{ 'Finished' if tournament.tournament_finished else 'Incomplete' }}</span>
+              </div>
+            </div>
+            <div class="archive-actions">
+              <a href="/archive/tournament/{{ tournament.filename }}" class="action-btn view-btn">📊 View</a>
+              <button class="action-btn edit-btn" onclick="event.stopPropagation(); editArchive('tournament', '{{ tournament.filename }}', {{ tournament|tojson }})">
+                ✏️ Edit
+              </button>
+              <button class="action-btn delete-btn" onclick="event.stopPropagation(); deleteArchive('tournament', '{{ tournament.filename }}')">
+                🗑️
+              </button>
+            </div>
+          </div>
+        </div>
+        {% endfor %}
+      </div>
+    </div>
+    {% endif %}
+
+    <!-- Other/Unknown Target Count Tournaments -->
+    {% set tournaments_other = tournaments|rejectattr('tournament_type', 'in', ['4_targets', '20_targets', '40_targets'])|list %}
+    {% if tournaments_other %}
+    <div class="section">
+      <div class="section-title">
+        <span>🏆 Other Tournaments</span>
+        <div class="section-controls">
+          <button class="filter-btn active" onclick="filterTournaments('other', 'all')">All</button>
+          <button class="filter-btn" onclick="filterTournaments('other', 'finished')">Finished</button>
+          <button class="filter-btn" onclick="filterTournaments('other', 'recent')">Recent</button>
+        </div>
+      </div>
+      <div class="archive-grid" id="tournaments-other-grid">
+        {% for tournament in tournaments_other %}
+        <div class="archive-card tournament-other" data-status="{{ 'finished' if tournament.tournament_finished else 'incomplete' }}" data-date="{{ tournament.archived_at }}" data-targets="other" onclick="viewTournament('{{ tournament.filename }}')">
+          <div class="archive-header">
+            <div>
+              <div class="archive-title">Tournament ({{ tournament.tournament_type or 'Unknown' }})</div>
               <div class="archive-subtitle">{{ tournament.created_at[:10] if tournament.created_at != 'Unknown' else 'Unknown Date' }}</div>
             </div>
             <span class="archive-badge badge-tournament">Tournament</span>
@@ -589,9 +946,12 @@
               </div>
             </div>
             <div class="archive-actions">
-              <a href="/archive/tournament/{{ tournament.filename }}" class="view-btn">📊 View Results</a>
-              <button class="delete-btn" onclick="event.stopPropagation(); deleteArchive('tournament', '{{ tournament.filename }}')">
-                🗑️ Delete
+              <a href="/archive/tournament/{{ tournament.filename }}" class="action-btn view-btn">📊 View</a>
+              <button class="action-btn edit-btn" onclick="event.stopPropagation(); editArchive('tournament', '{{ tournament.filename }}', {{ tournament|tojson }})">
+                ✏️ Edit
+              </button>
+              <button class="action-btn delete-btn" onclick="event.stopPropagation(); deleteArchive('tournament', '{{ tournament.filename }}')">
+                🗑️
               </button>
             </div>
           </div>
@@ -600,6 +960,8 @@
       </div>
     </div>
     {% endif %}
+    
+    {% endif %}
 
     <!-- Empty State -->
     {% if not leagues and not tournaments %}
@@ -616,7 +978,7 @@
 
   <!-- Confirmation Modal -->
   <div class="modal-overlay" id="confirmationModal">
-    <div class="confirmation-modal">
+    <div class="modal">
       <div class="modal-title" id="modalTitle">Confirm Action</div>
       <div class="modal-message" id="modalMessage">Are you sure you want to proceed?</div>
       <div class="modal-buttons">
@@ -626,8 +988,48 @@
     </div>
   </div>
 
+  <!-- Edit Modal -->
+  <div class="modal-overlay" id="editModal">
+    <div class="modal">
+      <div class="modal-title" id="editModalTitle">Edit Archive</div>
+      <form class="edit-form" id="editForm">
+        <div class="form-group">
+          <label class="form-label">Archive Name</label>
+          <input type="text" class="form-input" id="editName" placeholder="Enter archive name">
+        </div>
+        <div class="form-group">
+          <label class="form-label">Format Type</label>
+          <select class="form-select" id="editType">
+            <option value="single_elimination">Single Elimination</option>
+            <option value="double_elimination">Double Elimination</option>
+            <option value="round_robin">Round Robin</option>
+            <option value="swiss">Swiss System</option>
+            <option value="league">League Championship</option>
+          </select>
+        </div>
+        <div class="form-group" id="targetCountGroup">
+          <label class="form-label">Target Format</label>
+          <select class="form-select" id="editTargetCount">
+            <option value="4_targets">4 Targets (5 shots each)</option>
+            <option value="20_targets">20 Targets (2 shots each)</option>
+            <option value="40_targets">40 Targets (2 shots each)</option>
+          </select>
+        </div>
+        <div class="form-group">
+          <label class="form-label">Notes</label>
+          <input type="text" class="form-input" id="editNotes" placeholder="Add notes about this tournament">
+        </div>
+      </form>
+      <div class="modal-buttons">
+        <button class="modal-btn cancel" onclick="closeEditModal()">Cancel</button>
+        <button class="modal-btn primary" onclick="saveEdit()">Save Changes</button>
+      </div>
+    </div>
+  </div>
+
   <script>
     let pendingAction = null;
+    let editingItem = null;
 
     // Navigation functions
     function viewTournament(filename) {
@@ -638,6 +1040,7 @@
       window.location.href = `/archive/league/${filename}`;
     }
 
+    // Delete function
     async function deleteArchive(type, filename) {
       showModal(
         'Delete Archive',
@@ -664,6 +1067,114 @@
       );
     }
 
+    // Edit function
+    function editArchive(type, filename, data) {
+      editingItem = { type, filename, data };
+      
+      document.getElementById('editModalTitle').textContent = `Edit ${type.charAt(0).toUpperCase() + type.slice(1)}`;
+      document.getElementById('editName').value = data.name || `${type} - ${data.created_at?.substring(0, 10) || 'Unknown'}`;
+      
+      // For format type, use a default since this isn't typically stored
+      document.getElementById('editType').value = type === 'league' ? 'league' : 'single_elimination';
+      document.getElementById('editNotes').value = data.notes || '';
+      
+      // Show/hide target count field - both tournaments and leagues have tournament_type
+      const targetCountGroup = document.getElementById('targetCountGroup');
+      if (type === 'tournament' || type === 'league') {
+        targetCountGroup.style.display = 'flex';
+        document.getElementById('editTargetCount').value = data.tournament_type || '20_targets';
+      } else {
+        targetCountGroup.style.display = 'none';
+      }
+      
+      document.getElementById('editModal').classList.add('active');
+    }
+
+    // Save edit function
+    async function saveEdit() {
+      if (!editingItem) return;
+
+      const updatedData = {
+        name: document.getElementById('editName').value,
+        notes: document.getElementById('editNotes').value
+      };
+
+      // For both tournaments and leagues, save the tournament_type (target format)
+      if (editingItem.type === 'tournament' || editingItem.type === 'league') {
+        updatedData.tournament_type = document.getElementById('editTargetCount').value;
+      }
+
+      try {
+        const response = await fetch(`/api/archive/update/${editingItem.type}/${editingItem.filename}`, {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json'
+          },
+          body: JSON.stringify(updatedData)
+        });
+
+        const result = await response.json();
+
+        if (result.status === 'success') {
+          alert('Archive updated successfully');
+          location.reload();
+        } else {
+          alert('Error updating archive: ' + result.message);
+        }
+      } catch (error) {
+        alert('Error updating archive: ' + error.message);
+      }
+      
+      closeEditModal();
+    }
+
+    // Filtering functions
+    function filterLeagues(filter) {
+      const cards = document.querySelectorAll('#leagues-grid .archive-card');
+      const buttons = document.querySelectorAll('#leagues-grid').parentElement.querySelectorAll('.filter-btn');
+      
+      // Update active button
+      buttons.forEach(btn => btn.classList.remove('active'));
+      event.target.classList.add('active');
+
+      // Filter cards
+      cards.forEach(card => {
+        const isCompleted = card.dataset.status === 'completed';
+        const date = new Date(card.dataset.date);
+        const isRecent = (Date.now() - date.getTime()) < (30 * 24 * 60 * 60 * 1000); // Last 30 days
+
+        let show = true;
+        if (filter === 'completed' && !isCompleted) show = false;
+        if (filter === 'recent' && !isRecent) show = false;
+
+        card.classList.toggle('hidden', !show);
+      });
+    }
+
+    function filterTournaments(targetCount, filter) {
+      const gridId = targetCount === 'other' ? 'tournaments-other-grid' : `tournaments-${targetCount}-grid`;
+      const cards = document.querySelectorAll(`#${gridId} .archive-card`);
+      const section = document.querySelector(`#${gridId}`).closest('.section');
+      const buttons = section.querySelectorAll('.filter-btn');
+      
+      // Update active button
+      buttons.forEach(btn => btn.classList.remove('active'));
+      event.target.classList.add('active');
+
+      // Filter cards
+      cards.forEach(card => {
+        const isFinished = card.dataset.status === 'finished';
+        const date = new Date(card.dataset.date);
+        const isRecent = (Date.now() - date.getTime()) < (30 * 24 * 60 * 60 * 1000); // Last 30 days
+
+        let show = true;
+        if (filter === 'finished' && !isFinished) show = false;
+        if (filter === 'recent' && !isRecent) show = false;
+
+        card.classList.toggle('hidden', !show);
+      });
+    }
+
     // Modal functions
     function showModal(title, message, confirmCallback) {
       document.getElementById('modalTitle').textContent = title;
@@ -677,6 +1188,11 @@
       pendingAction = null;
     }
 
+    function closeEditModal() {
+      document.getElementById('editModal').classList.remove('active');
+      editingItem = null;
+    }
+
     function confirmAction() {
       if (pendingAction) {
         pendingAction();
@@ -690,11 +1206,42 @@
       }
     });
 
+    document.getElementById('editModal').addEventListener('click', function(e) {
+      if (e.target === this) {
+        closeEditModal();
+      }
+    });
+
     // Initialize page
     document.addEventListener('DOMContentLoaded', function() {
-      console.log('📚 Archive loaded');
-      console.log('🏆 Tournaments:', {{ tournaments|length if tournaments else 0 }});
+      console.log('📚 Enhanced Archive loaded');
+      console.log('🏆 Total Tournaments:', {{ tournaments|length if tournaments else 0 }});
       console.log('🎖️ Leagues:', {{ leagues|length if leagues else 0 }});
+      
+      {% if tournaments %}
+      const tournaments = {{ tournaments|tojson }};
+      console.log('Tournament data sample:', tournaments[0] || 'No tournaments');
+      
+      // Count tournaments by type
+      const tournaments40 = tournaments.filter(t => t.tournament_type === '40_targets');
+      const tournaments20 = tournaments.filter(t => t.tournament_type === '20_targets');
+      const tournaments4 = tournaments.filter(t => t.tournament_type === '4_targets');
+      const tournamentsOther = tournaments.filter(t => !['4_targets', '20_targets', '40_targets'].includes(t.tournament_type));
+      
+      console.log('🎯 40-Target Tournaments:', tournaments40.length);
+      console.log('🏹 20-Target Tournaments:', tournaments20.length);
+      console.log('🎪 4-Target Tournaments:', tournaments4.length);
+      console.log('🏆 Other Tournaments:', tournamentsOther.length);
+      
+      // Log tournament types for debugging
+      const tournamentTypes = [...new Set(tournaments.map(t => t.tournament_type))];
+      console.log('Available tournament types:', tournamentTypes);
+      {% else %}
+      console.log('🎯 40-Target Tournaments: 0');
+      console.log('🏹 20-Target Tournaments: 0');
+      console.log('🎪 4-Target Tournaments: 0');
+      console.log('🏆 Other Tournaments: 0');
+      {% endif %}
     });
   </script>
 </body>
diff --git a/templates/modern_player_analysis.html b/templates/modern_player_analysis.html
index 144d441..085a80a 100644
--- a/templates/modern_player_analysis.html
+++ b/templates/modern_player_analysis.html
@@ -23,14 +23,13 @@
         .navbar {
             background: white;
             color: black;
-            padding: 10px 20px;
+            padding: 15px 25px;
             display: flex;
             align-items: center;
             justify-content: space-between;
             border-bottom: 2px solid #ccc;
-            height: 60px;
-            box-sizing: border-box;
-            }
+            box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+        }
 
         .navbar-title {
             font-size: 1.8rem;
diff --git a/templates/modern_player_stats.html b/templates/modern_player_stats.html
index 2cfeefd..b34c2a9 100644
--- a/templates/modern_player_stats.html
+++ b/templates/modern_player_stats.html
@@ -22,17 +22,14 @@
 
         /* Enhanced Navigation Bar */
         .navbar {
-            background: rgba(255, 255, 255, 0.95);
-            backdrop-filter: blur(10px);
+            background: white;
             color: black;
-            padding: 12px 25px;
+            padding: 15px 25px;
             display: flex;
             align-items: center;
             justify-content: space-between;
-            border-bottom: 2px solid rgba(102, 126, 234, 0.3);
-            box-shadow: 0 4px 20px rgba(0, 0, 0, 0.1);
-            height: 60px;
-            flex-shrink: 0;
+            border-bottom: 2px solid #ccc;
+            box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
         }
 
         .navbar-title {
diff --git a/templates/results_calculator.html b/templates/results_calculator.html
index 647ccb5..c0b10e0 100644
--- a/templates/results_calculator.html
+++ b/templates/results_calculator.html
@@ -128,6 +128,7 @@
       justify-content: center;
       gap: 30px;
       flex-wrap: wrap;
+      margin-bottom: 20px;
     }
 
     .progress-item {
@@ -146,6 +147,46 @@
       text-transform: uppercase;
     }
 
+    .global-actions {
+      display: flex;
+      justify-content: center;
+      gap: 15px;
+      flex-wrap: wrap;
+      margin-top: 20px;
+    }
+
+    .global-btn {
+      padding: 12px 24px;
+      border: none;
+      border-radius: 8px;
+      font-size: 1rem;
+      font-weight: bold;
+      cursor: pointer;
+      transition: all 0.2s ease;
+    }
+
+    .fill-all-btn {
+      background: #ff6b35;
+      color: white;
+    }
+
+    .fill-all-btn:hover {
+      background: #e55a2b;
+      transform: translateY(-1px);
+      box-shadow: 0 4px 8px rgba(255, 107, 53, 0.3);
+    }
+
+    .save-all-btn {
+      background: #17a2b8;
+      color: white;
+    }
+
+    .save-all-btn:hover {
+      background: #138496;
+      transform: translateY(-1px);
+      box-shadow: 0 4px 8px rgba(23, 162, 184, 0.3);
+    }
+
     .participants-list {
       display: flex;
       flex-direction: column;
@@ -296,26 +337,58 @@
 
     .targets-grid {
       display: grid;
-      grid-template-columns: repeat(auto-fit, minmax(70px, 1fr));
       gap: 10px;
       margin-bottom: 20px;
       max-width: 100%;
     }
 
-    /* Responsive adjustments for 20 targets */
+    /* Grid layouts for different target counts */
+    .targets-grid.targets-4 {
+      grid-template-columns: repeat(4, 1fr);
+    }
+
+    .targets-grid.targets-20 {
+      grid-template-columns: repeat(auto-fit, minmax(70px, 1fr));
+    }
+
+    .targets-grid.targets-40 {
+      grid-template-columns: repeat(auto-fit, minmax(70px, 1fr));
+    }
+
+    /* Responsive adjustments */
     @media (max-width: 768px) {
-      .targets-grid {
+      .targets-grid.targets-20 {
         grid-template-columns: repeat(5, 1fr);
         gap: 8px;
       }
+      
+      .targets-grid.targets-40 {
+        grid-template-columns: repeat(8, 1fr);
+        gap: 6px;
+      }
+      
+      .targets-grid.targets-4 {
+        grid-template-columns: repeat(2, 1fr);
+        gap: 12px;
+      }
     }
 
     @media (max-width: 480px) {
-      .targets-grid {
+      .targets-grid.targets-20 {
         grid-template-columns: repeat(4, 1fr);
         gap: 6px;
         padding: 15px;
       }
+      
+      .targets-grid.targets-40 {
+        grid-template-columns: repeat(6, 1fr);
+        gap: 4px;
+      }
+      
+      .targets-grid.targets-4 {
+        grid-template-columns: repeat(2, 1fr);
+        gap: 10px;
+      }
     }
 
     .target-group {
@@ -344,6 +417,10 @@
       gap: 3px;
     }
 
+    .shots-container.shots-5 {
+      gap: 2px;
+    }
+
     .shot-input {
       width: 100%;
       padding: 6px;
@@ -354,6 +431,11 @@
       font-weight: bold;
     }
 
+    .shots-container.shots-5 .shot-input {
+      padding: 4px;
+      font-size: 0.8rem;
+    }
+
     .shot-input:focus {
       outline: none;
       border-color: #007bff;
@@ -482,6 +564,15 @@
       .progress-info {
         gap: 20px;
       }
+
+      .global-actions {
+        flex-direction: column;
+        align-items: center;
+      }
+
+      .global-btn {
+        min-width: 200px;
+      }
     }
 
     /* Loading and saving indicators */
@@ -522,7 +613,15 @@
   <div class="container">
     <div class="header-section">
       <div class="header-title">🎯 Tournament Scoring</div>
-      <div class="header-subtitle">Enter scores for each participant (20 targets, 2 shots each). Score 0 = miss.</div>
+      <div class="header-subtitle" id="tournamentSubtitle">
+        {% if results.tournament_type == '40_targets' %}
+          Enter scores for each participant (40 targets, 2 shots each). Score 0 = miss.
+        {% elif results.tournament_type == '4_targets' %}
+          Enter scores for each participant (4 targets, 5 shots each). Score 0 = miss.
+        {% else %}
+          Enter scores for each participant (20 targets, 2 shots each). Score 0 = miss.
+        {% endif %}
+      </div>
       
       <div class="progress-info">
         <div class="progress-item">
@@ -538,6 +637,12 @@
           <div class="progress-label">Total Shots</div>
         </div>
       </div>
+
+      <div class="global-actions">
+        <button class="global-btn fill-all-btn" onclick="fillAllPlayersRandom()">
+          🎲 Fill All Players Random
+        </button>
+      </div>
     </div>
 
     <div class="participants-list">
@@ -567,44 +672,13 @@
           <div class="participant-content">
             <div class="targets-section">
               <div class="targets-grid" id="targets-{{ player_id }}">
-                {% for i in range(1, 21) %}
-                  <div class="target-group" id="target-group-{{ player_id }}-{{ i }}">
-                    <div class="target-number">{{ i }}</div>
-                    <div class="shots-container">
-                      <input type="number" 
-                             class="shot-input" 
-                             id="shot1-{{ player_id }}-{{ i }}"
-                             data-player="{{ player_id }}" 
-                             data-target="{{ i }}" 
-                             data-shot="1"
-                             min="0" 
-                             max="10" 
-                             value="{% if participant.targets[i|string].shot1 is not none %}{{ participant.targets[i|string].shot1 }}{% endif %}"
-                             placeholder="S1"
-                             oninput="updateScore({{ player_id }}, {{ i }}, 1, this.value)">
-                      <input type="number" 
-                             class="shot-input" 
-                             id="shot2-{{ player_id }}-{{ i }}"
-                             data-player="{{ player_id }}" 
-                             data-target="{{ i }}" 
-                             data-shot="2"
-                             min="0" 
-                             max="10" 
-                             value="{% if participant.targets[i|string].shot2 is not none %}{{ participant.targets[i|string].shot2 }}{% endif %}"
-                             placeholder="S2"
-                             oninput="updateScore({{ player_id }}, {{ i }}, 2, this.value)">
-                    </div>
-                  </div>
-                {% endfor %}
+                <!-- Targets will be populated by JavaScript based on tournament type -->
               </div>
 
               <div class="participant-actions">
                 <button class="action-btn clear-btn" onclick="clearParticipant({{ player_id }})">
                   🗑️ Clear All
                 </button>
-                <button class="action-btn auto-fill-btn" onclick="autoFillDemo({{ player_id }})">
-                  🎲 Demo Fill
-                </button>
                 <button class="action-btn save-btn" onclick="saveParticipant({{ player_id }})">
                   💾 Save Progress
                 </button>
@@ -632,6 +706,24 @@
   <script>
     let results = {{ results|tojson }};
     let saveTimeout = {};
+    
+    // Tournament configuration
+    const tournamentType = results.tournament_type || '20_targets';
+    let numTargets, shotsPerTarget;
+    
+    // Set tournament parameters
+    if (tournamentType === '40_targets') {
+      numTargets = 40;
+      shotsPerTarget = 2;
+    } else if (tournamentType === '4_targets') {
+      numTargets = 4;
+      shotsPerTarget = 5;
+    } else {
+      numTargets = 20;
+      shotsPerTarget = 2;
+    }
+
+    console.log(`Tournament config: ${numTargets} targets, ${shotsPerTarget} shots each`);
 
     // Debounce function for auto-saving
     function debounce(func, wait, immediate) {
@@ -649,6 +741,56 @@
       };
     }
 
+    function generateTargetsHTML(playerId) {
+      const participant = results.participants[playerId.toString()];
+      let html = '';
+      
+      for (let i = 1; i <= numTargets; i++) {
+        const targetData = participant.targets[i.toString()] || {};
+        
+        html += `
+          <div class="target-group" id="target-group-${playerId}-${i}">
+            <div class="target-number">${i}</div>
+            <div class="shots-container shots-${shotsPerTarget}">
+        `;
+        
+        for (let shot = 1; shot <= shotsPerTarget; shot++) {
+          const shotKey = `shot${shot}`;
+          const value = targetData[shotKey];
+          const displayValue = value !== null && value !== undefined ? value : '';
+          
+          html += `
+            <input type="number" 
+                   class="shot-input" 
+                   id="shot${shot}-${playerId}-${i}"
+                   data-player="${playerId}" 
+                   data-target="${i}" 
+                   data-shot="${shot}"
+                   min="0" 
+                   max="10" 
+                   value="${displayValue}"
+                   placeholder="S${shot}"
+                   oninput="updateScore(${playerId}, ${i}, ${shot}, this.value)">
+          `;
+        }
+        
+        html += `
+            </div>
+          </div>
+        `;
+      }
+      
+      return html;
+    }
+
+    function initializeTargetsForPlayer(playerId) {
+      const targetsContainer = document.getElementById(`targets-${playerId}`);
+      if (targetsContainer) {
+        targetsContainer.className = `targets-grid targets-${numTargets}`;
+        targetsContainer.innerHTML = generateTargetsHTML(playerId);
+      }
+    }
+
     function toggleParticipant(playerId) {
       const card = document.getElementById(`card-${playerId}`);
       card.classList.toggle('collapsed');
@@ -678,7 +820,12 @@
         return;
       }
       if (!results.participants[playerIdStr].targets[targetStr]) {
-        results.participants[playerIdStr].targets[targetStr] = {shot1: null, shot2: null};
+        // Initialize target with all shots as null
+        const target = {};
+        for (let i = 1; i <= shotsPerTarget; i++) {
+          target[`shot${i}`] = null;
+        }
+        results.participants[playerIdStr].targets[targetStr] = target;
       }
       
       results.participants[playerIdStr].targets[targetStr][`shot${shotNum}`] = numValue;
@@ -711,13 +858,19 @@
       const targetGroup = document.getElementById(`target-group-${playerId}-${targetNum}`);
       
       if (targetGroup && results.participants[playerIdStr].targets[targetStr]) {
-        const shot1 = results.participants[playerIdStr].targets[targetStr].shot1;
-        const shot2 = results.participants[playerIdStr].targets[targetStr].shot2;
+        const targetData = results.participants[playerIdStr].targets[targetStr];
         
-        // Target is completed if both shots have been entered (including 0)
-        const isCompleted = shot1 !== null && shot1 !== undefined && shot2 !== null && shot2 !== undefined;
+        // Check if all shots are completed
+        let allCompleted = true;
+        for (let i = 1; i <= shotsPerTarget; i++) {
+          const shotValue = targetData[`shot${i}`];
+          if (shotValue === null || shotValue === undefined) {
+            allCompleted = false;
+            break;
+          }
+        }
         
-        if (isCompleted) {
+        if (allCompleted) {
           targetGroup.classList.add('completed');
         } else {
           targetGroup.classList.remove('completed');
@@ -731,10 +884,11 @@
       let total = 0;
       
       for (let target in targets) {
-        const shot1 = targets[target].shot1;
-        const shot2 = targets[target].shot2;
-        total += (shot1 !== null && shot1 !== undefined ? shot1 : 0);
-        total += (shot2 !== null && shot2 !== undefined ? shot2 : 0);
+        const targetData = targets[target];
+        for (let i = 1; i <= shotsPerTarget; i++) {
+          const shotValue = targetData[`shot${i}`];
+          total += (shotValue !== null && shotValue !== undefined ? shotValue : 0);
+        }
       }
       
       results.participants[playerIdStr].total_score = total;
@@ -762,33 +916,30 @@
       let totalShots = 0;
       
       for (let target in targets) {
-        const shot1 = targets[target].shot1;
-        const shot2 = targets[target].shot2;
+        const targetData = targets[target];
+        let targetCompleted = true;
         
-        // Count shots that have been entered (including 0)
-        if (shot1 !== null && shot1 !== undefined) totalShots++;
-        if (shot2 !== null && shot2 !== undefined) totalShots++;
+        for (let i = 1; i <= shotsPerTarget; i++) {
+          const shotValue = targetData[`shot${i}`];
+          
+          // Count shots that have been entered (including 0)
+          if (shotValue !== null && shotValue !== undefined) {
+            totalShots++;
+          } else {
+            targetCompleted = false;
+          }
+        }
         
-        // Target is completed if both shots have been entered
-        if (shot1 !== null && shot1 !== undefined && shot2 !== null && shot2 !== undefined) {
+        if (targetCompleted) {
           completedTargets++;
         }
       }
       
-      const isCompleted = completedTargets === 20;
+      const isCompleted = completedTargets === numTargets;
       const isInProgress = totalShots > 0 && !isCompleted;
       
       results.participants[playerIdStr].completed = isCompleted;
       
-      // Debug logging
-      console.log(`Player ${playerId} status:`, {
-        completedTargets,
-        totalShots,
-        isCompleted,
-        isInProgress,
-        sampleTarget: targets['1']
-      });
-      
       // Update card styling
       card.classList.remove('completed', 'in-progress');
       if (isCompleted) {
@@ -814,8 +965,10 @@
         
         for (let target in participant.targets) {
           const targetData = participant.targets[target];
-          if (targetData.shot1 !== null && targetData.shot1 !== undefined) totalShots++;
-          if (targetData.shot2 !== null && targetData.shot2 !== undefined) totalShots++;
+          for (let i = 1; i <= shotsPerTarget; i++) {
+            const shotValue = targetData[`shot${i}`];
+            if (shotValue !== null && shotValue !== undefined) totalShots++;
+          }
         }
       }
       
@@ -881,6 +1034,36 @@
       }
     }
 
+    async function saveAllPlayers() {
+      const saveAllBtn = document.querySelector('.save-all-btn');
+      const originalText = saveAllBtn.textContent;
+      saveAllBtn.textContent = '💾 Saving All...';
+      saveAllBtn.disabled = true;
+      
+      try {
+        const playerIds = Object.keys(results.participants);
+        for (const playerId of playerIds) {
+          await saveParticipant(parseInt(playerId), true);
+        }
+        
+        // Show success feedback
+        saveAllBtn.textContent = '✅ All Saved!';
+        saveAllBtn.style.background = '#28a745';
+        
+        setTimeout(() => {
+          saveAllBtn.textContent = originalText;
+          saveAllBtn.style.background = '';
+          saveAllBtn.disabled = false;
+        }, 2000);
+        
+      } catch (error) {
+        console.error('Error saving all players:', error);
+        alert('Failed to save all player data. Please try again.');
+        saveAllBtn.textContent = originalText;
+        saveAllBtn.disabled = false;
+      }
+    }
+
     function clearParticipant(playerId) {
       if (!confirm('Are you sure you want to clear all scores for this participant?')) {
         return;
@@ -889,15 +1072,18 @@
       const playerIdStr = playerId.toString();
       
       // Clear all inputs
-      for (let i = 1; i <= 20; i++) {
-        const shot1Input = document.getElementById(`shot1-${playerId}-${i}`);
-        const shot2Input = document.getElementById(`shot2-${playerId}-${i}`);
-        
-        if (shot1Input) shot1Input.value = '';
-        if (shot2Input) shot2Input.value = '';
+      for (let i = 1; i <= numTargets; i++) {
+        for (let shot = 1; shot <= shotsPerTarget; shot++) {
+          const shotInput = document.getElementById(`shot${shot}-${playerId}-${i}`);
+          if (shotInput) shotInput.value = '';
+        }
         
         // Update data
-        results.participants[playerIdStr].targets[i.toString()] = {shot1: null, shot2: null};
+        const target = {};
+        for (let shot = 1; shot <= shotsPerTarget; shot++) {
+          target[`shot${shot}`] = null;
+        }
+        results.participants[playerIdStr].targets[i.toString()] = target;
         
         // Update target group styling
         updateTargetGroupStyling(playerId, i);
@@ -916,24 +1102,27 @@
         return;
       }
       
+      fillPlayerRandom(playerId);
+      saveParticipant(playerId);
+    }
+
+    function fillPlayerRandom(playerId) {
       const playerIdStr = playerId.toString();
       
       // Fill with random scores (0-10) - all fields will be filled
-      for (let i = 1; i <= 20; i++) {
-        const shot1 = Math.floor(Math.random() * 11);
-        const shot2 = Math.floor(Math.random() * 11);
+      for (let i = 1; i <= numTargets; i++) {
+        const target = {};
         
-        const shot1Input = document.getElementById(`shot1-${playerId}-${i}`);
-        const shot2Input = document.getElementById(`shot2-${playerId}-${i}`);
-        
-        if (shot1Input) shot1Input.value = shot1;
-        if (shot2Input) shot2Input.value = shot2;
+        for (let shot = 1; shot <= shotsPerTarget; shot++) {
+          const randomScore = Math.floor(Math.random() * 11);
+          const shotInput = document.getElementById(`shot${shot}-${playerId}-${i}`);
+          
+          if (shotInput) shotInput.value = randomScore;
+          target[`shot${shot}`] = randomScore;
+        }
         
         // Update data
-        results.participants[playerIdStr].targets[i.toString()] = {
-          shot1: shot1,
-          shot2: shot2
-        };
+        results.participants[playerIdStr].targets[i.toString()] = target;
         
         // Update target group styling
         updateTargetGroupStyling(playerId, i);
@@ -942,9 +1131,64 @@
       updateParticipantTotal(playerId);
       updateParticipantStatus(playerId);
       updateOverallProgress();
+    }
+
+    async function fillAllPlayersRandom() {
+      if (!confirm('Fill ALL players with random demo scores? This will overwrite all existing data and enable tournament finish.')) {
+        return;
+      }
       
-      // Save changes
-      saveParticipant(playerId);
+      const fillAllBtn = document.querySelector('.fill-all-btn');
+      const originalText = fillAllBtn.textContent;
+      fillAllBtn.textContent = '🎲 Filling All...';
+      fillAllBtn.disabled = true;
+      
+      try {
+        // Fill all players with random data
+        const playerIds = Object.keys(results.participants);
+        for (const playerId of playerIds) {
+          fillPlayerRandom(parseInt(playerId));
+        }
+        
+        // Save all players
+        for (const playerId of playerIds) {
+          await saveParticipant(parseInt(playerId), true);
+        }
+        
+        // Show success feedback
+        fillAllBtn.textContent = '✅ All Filled!';
+        fillAllBtn.style.background = '#28a745';
+        
+        // Show notification
+        const notification = document.createElement('div');
+        notification.style.cssText = `
+          position: fixed;
+          top: 20px;
+          right: 20px;
+          background: #28a745;
+          color: white;
+          padding: 15px 25px;
+          border-radius: 8px;
+          z-index: 1000;
+          font-weight: bold;
+          box-shadow: 0 4px 12px rgba(40, 167, 69, 0.3);
+        `;
+        notification.textContent = '🎯 All players filled with random scores! Tournament ready to finish.';
+        document.body.appendChild(notification);
+        
+        setTimeout(() => {
+          document.body.removeChild(notification);
+          fillAllBtn.textContent = originalText;
+          fillAllBtn.style.background = '';
+          fillAllBtn.disabled = false;
+        }, 4000);
+        
+      } catch (error) {
+        console.error('Error filling all players:', error);
+        alert('Failed to fill all players. Please try again.');
+        fillAllBtn.textContent = originalText;
+        fillAllBtn.disabled = false;
+      }
     }
 
     async function finishTournament() {
@@ -993,77 +1237,51 @@
     document.addEventListener('keydown', function(event) {
       if (event.ctrlKey && event.key === 's') {
         event.preventDefault();
-        // Save all participants
-        Object.keys(results.participants).forEach(playerId => {
-          saveParticipant(parseInt(playerId), true);
-        });
-        
-        // Show feedback
-        const feedback = document.createElement('div');
-        feedback.style.cssText = `
-          position: fixed;
-          top: 20px;
-          right: 20px;
-          background: #28a745;
-          color: white;
-          padding: 10px 20px;
-          border-radius: 6px;
-          z-index: 1000;
-          font-weight: bold;
-        `;
-        feedback.textContent = '💾 All progress saved!';
-        document.body.appendChild(feedback);
-        
-        setTimeout(() => {
-          document.body.removeChild(feedback);
-        }, 3000);
+        saveAllPlayers();
       }
     });
 
     // Initialize
     document.addEventListener('DOMContentLoaded', function() {
-      // Debug: Log initial results structure
       console.log('Initial results structure:', results);
-      console.log('Sample participant targets:', results.participants[Object.keys(results.participants)[0]]?.targets);
+      console.log(`Tournament type: ${tournamentType}, Targets: ${numTargets}, Shots per target: ${shotsPerTarget}`);
       
-      // Update initial states
+      // Initialize targets for all players
       Object.keys(results.participants).forEach(playerId => {
-        for (let i = 1; i <= 20; i++) {
+        initializeTargetsForPlayer(parseInt(playerId));
+        
+        // Update initial states
+        for (let i = 1; i <= numTargets; i++) {
           updateTargetGroupStyling(parseInt(playerId), i);
         }
         updateParticipantStatus(parseInt(playerId));
       });
+      
       updateOverallProgress();
       
-      // Add input validation
-      document.querySelectorAll('.shot-input').forEach(input => {
-        input.addEventListener('blur', function() {
-          if (this.value !== '') {
-            const value = parseInt(this.value);
+      // Add input validation and navigation
+      document.addEventListener('input', function(e) {
+        if (e.target.classList.contains('shot-input')) {
+          if (e.target.value !== '') {
+            const value = parseInt(e.target.value);
             const clampedValue = Math.max(0, Math.min(10, isNaN(value) ? 0 : value));
-            if (this.value !== clampedValue.toString()) {
-              this.value = clampedValue;
-              // Trigger update
-              const playerId = parseInt(this.dataset.player);
-              const targetNum = parseInt(this.dataset.target);
-              const shotNum = parseInt(this.dataset.shot);
-              updateScore(playerId, targetNum, shotNum, clampedValue);
+            if (e.target.value !== clampedValue.toString()) {
+              e.target.value = clampedValue;
             }
           }
-        });
-        
-        // Handle Enter key to move to next input
-        input.addEventListener('keydown', function(e) {
-          if (e.key === 'Enter') {
-            const inputs = Array.from(document.querySelectorAll('.shot-input'));
-            const currentIndex = inputs.indexOf(this);
-            const nextInput = inputs[currentIndex + 1];
-            if (nextInput) {
-              nextInput.focus();
-              nextInput.select();
-            }
+        }
+      });
+      
+      document.addEventListener('keydown', function(e) {
+        if (e.target.classList.contains('shot-input') && e.key === 'Enter') {
+          const inputs = Array.from(document.querySelectorAll('.shot-input'));
+          const currentIndex = inputs.indexOf(e.target);
+          const nextInput = inputs[currentIndex + 1];
+          if (nextInput) {
+            nextInput.focus();
+            nextInput.select();
           }
-        });
+        }
       });
       
       console.log('🎯 Results Calculator initialized');
diff --git a/templates/tournament.html b/templates/tournament.html
index 4fc5b9d..452ed3c 100644
--- a/templates/tournament.html
+++ b/templates/tournament.html
@@ -186,7 +186,7 @@
 
     .type-options {
       display: grid;
-      grid-template-columns: 1fr 1fr;
+      grid-template-columns: repeat(auto-fit, minmax(280px, 1fr));
       gap: 15px;
     }
 
@@ -383,16 +383,114 @@
       gap: 15px;
     }
 
-    /* Add Player Form */
+    /* NEW PLAYER LIST STYLES */
+    .player-management-header {
+      display: flex;
+      gap: 15px;
+      align-items: center;
+      margin-bottom: 20px;
+      flex-wrap: wrap;
+    }
+
+    .search-container {
+      flex: 1;
+      min-width: 250px;
+      position: relative;
+    }
+
+    .search-input {
+      width: 100%;
+      padding: 12px 40px 12px 15px;
+      border: 2px solid #e9ecef;
+      border-radius: 8px;
+      font-size: 1rem;
+      transition: border-color 0.2s ease;
+    }
+
+    .search-input:focus {
+      outline: none;
+      border-color: #007bff;
+    }
+
+    .search-icon {
+      position: absolute;
+      right: 12px;
+      top: 50%;
+      transform: translateY(-50%);
+      color: #6c757d;
+      font-size: 1.1rem;
+    }
+
+    .player-controls {
+      display: flex;
+      gap: 10px;
+      align-items: center;
+      flex-wrap: wrap;
+    }
+
+    .filter-btn {
+      padding: 8px 16px;
+      border: 2px solid #e9ecef;
+      background: white;
+      border-radius: 6px;
+      cursor: pointer;
+      font-size: 0.9rem;
+      font-weight: 500;
+      transition: all 0.2s ease;
+      white-space: nowrap;
+    }
+
+    .filter-btn:hover {
+      border-color: #007bff;
+      background: #f8f9fa;
+    }
+
+    .filter-btn.active {
+      background: #007bff;
+      color: white;
+      border-color: #007bff;
+    }
+
+    .bulk-actions {
+      display: flex;
+      gap: 8px;
+      align-items: center;
+    }
+
+    .bulk-btn {
+      padding: 8px 12px;
+      border: 2px solid #e9ecef;
+      background: white;
+      border-radius: 6px;
+      cursor: pointer;
+      font-size: 0.85rem;
+      font-weight: 500;
+      transition: all 0.2s ease;
+      white-space: nowrap;
+    }
+
+    .bulk-btn:hover {
+      border-color: #28a745;
+      background: #f8fff9;
+    }
+
+    .bulk-btn.danger:hover {
+      border-color: #dc3545;
+      background: #fff5f5;
+    }
+
+    .add-player-section {
+      background: #f8f9fa;
+      border: 2px solid #e9ecef;
+      border-radius: 8px;
+      padding: 20px;
+      margin-bottom: 25px;
+    }
+
     .add-player-form {
       display: flex;
       gap: 15px;
       align-items: center;
-      padding: 20px;
-      background: #f8f9fa;
-      border: 1px solid #dee2e6;
-      border-radius: 8px;
-      margin-bottom: 25px;
     }
 
     .add-player-form input {
@@ -431,197 +529,214 @@
       cursor: not-allowed;
     }
 
-    .uncheck-all-btn {
-      background: #dc3545;
-      border: none;
-      color: white;
-      padding: 12px 20px;
-      border-radius: 6px;
-      cursor: pointer;
-      font-weight: bold;
-      font-size: 1rem;
-      transition: background-color 0.2s ease;
-      white-space: nowrap;
-    }
-
-    .uncheck-all-btn:hover {
-      background: #c82333;
-    }
-
-    .uncheck-all-btn:disabled {
-      background: #6c757d;
-      cursor: not-allowed;
-    }
-
-    /* Player Cards */
-    .player-grid {
-      display: grid;
-      grid-template-columns: repeat(auto-fit, minmax(350px, 1fr));
-      gap: 20px;
-      margin-top: 20px;
-    }
-
-    .player-card {
+    /* Player Table/List */
+    .player-list-container {
       background: white;
-      border-radius: 8px;
-      padding: 20px;
-      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
       border: 1px solid #dee2e6;
-      transition: box-shadow 0.2s ease;
-      position: relative;
+      border-radius: 8px;
+      overflow: hidden;
     }
 
-    .player-card.competing {
-      border-color: #28a745;
+    .player-table {
+      width: 100%;
+      border-collapse: collapse;
+    }
+
+    .player-table th,
+    .player-table td {
+      padding: 12px 15px;
+      text-align: left;
+      border-bottom: 1px solid #e9ecef;
+    }
+
+    .player-table th {
+      background: #f8f9fa;
+      font-weight: bold;
+      color: #495057;
+      position: sticky;
+      top: 0;
+      z-index: 10;
+    }
+
+    .player-table tr:hover {
+      background: #f8f9fa;
+    }
+
+    .player-table tr.enabled {
       background: #f8fff9;
     }
 
-    .player-card.not-competing {
-      border-color: #dc3545;
-      background: #fff5f5;
-      opacity: 0.8;
+    .player-table tr.enabled:hover {
+      background: #e8f5e8;
     }
 
-    .player-card:hover {
-      box-shadow: 0 4px 8px rgba(0, 0, 0, 0.15);
+    .player-table tr.disabled {
+      opacity: 0.6;
     }
 
-    .player-header {
-      display: flex;
-      align-items: center;
-      justify-content: space-between;
-      margin-bottom: 15px;
-    }
-
-    .player-id-badge {
-      background: #007bff;
-      color: white;
-      padding: 6px 12px;
-      border-radius: 15px;
-      font-size: 0.9rem;
+    .player-id {
       font-weight: bold;
-      min-width: 40px;
-      text-align: center;
-    }
-
-    .player-status {
-      font-size: 0.9rem;
-      font-weight: bold;
-      padding: 4px 10px;
-      border-radius: 12px;
-    }
-
-    .status-competing {
-      background: #d4edda;
-      color: #155724;
-    }
-
-    .status-not-competing {
-      background: #f8d7da;
-      color: #721c24;
-    }
-
-    .player-name-section {
-      margin: 15px 0;
+      color: #007bff;
+      min-width: 50px;
     }
 
     .player-name {
-      font-size: 1.2rem;
-      font-weight: 600;
+      font-weight: 500;
       color: #333;
-      margin-bottom: 5px;
+      min-width: 200px;
+    }
+
+    .player-name.editing {
+      padding: 0;
     }
 
     .player-name input {
       width: 100%;
       padding: 8px 12px;
-      border: 1px solid #ced4da;
-      border-radius: 6px;
-      font-size: 1.1rem;
-      font-weight: 600;
-      background: white;
-      transition: border-color 0.2s ease;
+      border: 2px solid #007bff;
+      border-radius: 4px;
+      font-size: 1rem;
+      font-weight: 500;
     }
 
-    .player-name input:focus {
-      outline: none;
-      border-color: #007bff;
+    .player-status {
+      min-width: 120px;
     }
 
-    .player-controls {
+    .status-badge {
+      display: inline-block;
+      padding: 4px 12px;
+      border-radius: 12px;
+      font-size: 0.85rem;
+      font-weight: bold;
+    }
+
+    .status-enabled {
+      background: #d4edda;
+      color: #155724;
+    }
+
+    .status-disabled {
+      background: #f8d7da;
+      color: #721c24;
+    }
+
+    .player-actions {
+      min-width: 160px;
+    }
+
+    .action-toggle {
       display: flex;
       align-items: center;
-      justify-content: space-between;
-      gap: 15px;
-      margin-top: 20px;
-      padding-top: 15px;
-      border-top: 1px solid #e9ecef;
+      gap: 8px;
+      margin-bottom: 8px;
     }
 
-    .competing-toggle {
-      display: flex;
-      align-items: center;
-      gap: 10px;
+    .toggle-switch {
+      position: relative;
+      width: 50px;
+      height: 24px;
+      background: #ccc;
+      border-radius: 12px;
       cursor: pointer;
-      padding: 5px 10px;
-      border-radius: 6px;
       transition: background-color 0.2s ease;
     }
 
-    .competing-toggle:hover {
-      background: #f8f9fa;
+    .toggle-switch.enabled {
+      background: #28a745;
     }
 
-    .toggle-checkbox {
-      width: 18px;
-      height: 18px;
-      cursor: pointer;
-      accent-color: #28a745;
+    .toggle-switch::after {
+      content: '';
+      position: absolute;
+      top: 2px;
+      left: 2px;
+      width: 20px;
+      height: 20px;
+      background: white;
+      border-radius: 50%;
+      transition: transform 0.2s ease;
     }
 
-    .toggle-label {
-      font-weight: 500;
-      color: #333;
-      cursor: pointer;
+    .toggle-switch.enabled::after {
+      transform: translateX(26px);
     }
 
-    .card-buttons {
+    .action-buttons-cell {
       display: flex;
-      gap: 8px;
+      gap: 6px;
     }
 
-    .edit-btn {
-      background: #ffc107;
+    .action-btn-small {
+      padding: 6px 10px;
       border: none;
-      color: white;
-      padding: 6px 12px;
       border-radius: 4px;
       cursor: pointer;
-      font-size: 0.9rem;
+      font-size: 0.85rem;
       font-weight: 500;
-      transition: background-color 0.2s ease;
+      transition: all 0.2s ease;
     }
 
-    .edit-btn:hover {
+    .edit-btn-small {
+      background: #ffc107;
+      color: white;
+    }
+
+    .edit-btn-small:hover {
       background: #e0a800;
     }
 
-    .delete-btn {
+    .delete-btn-small {
       background: #dc3545;
-      border: none;
       color: white;
-      padding: 6px 12px;
-      border-radius: 4px;
-      cursor: pointer;
-      font-size: 0.9rem;
-      font-weight: 500;
-      transition: background-color 0.2s ease;
     }
 
-    .delete-btn:hover {
+    .delete-btn-small:hover {
       background: #c82333;
     }
 
+    .stats-summary {
+      display: flex;
+      gap: 20px;
+      align-items: center;
+      margin-bottom: 15px;
+      padding: 15px;
+      background: #f8f9fa;
+      border-radius: 6px;
+      flex-wrap: wrap;
+    }
+
+    .stat-item {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      font-size: 0.9rem;
+    }
+
+    .stat-number {
+      font-weight: bold;
+      font-size: 1.1rem;
+    }
+
+    .stat-enabled {
+      color: #28a745;
+    }
+
+    .stat-disabled {
+      color: #dc3545;
+    }
+
+    .stat-total {
+      color: #007bff;
+    }
+
+    .no-results {
+      text-align: center;
+      padding: 40px 20px;
+      color: #6c757d;
+      font-style: italic;
+    }
+
     /* Confirmation Modal */
     .modal-overlay {
       position: fixed;
@@ -722,8 +837,18 @@
         padding: 20px 15px;
       }
 
-      .player-grid {
-        grid-template-columns: 1fr;
+      .player-management-header {
+        flex-direction: column;
+        align-items: stretch;
+      }
+
+      .search-container {
+        min-width: auto;
+      }
+
+      .player-controls,
+      .bulk-actions {
+        justify-content: center;
       }
 
       .add-player-form {
@@ -749,14 +874,35 @@
         min-width: 250px;
       }
 
-      .player-controls {
+      .stats-summary {
         flex-direction: column;
         align-items: stretch;
         gap: 10px;
       }
 
-      .card-buttons {
-        justify-content: center;
+      .player-table {
+        font-size: 0.9rem;
+      }
+
+      .player-table th,
+      .player-table td {
+        padding: 8px 10px;
+      }
+
+      .action-buttons-cell {
+        flex-direction: column;
+        gap: 4px;
+      }
+    }
+
+    /* Hide table columns on small screens */
+    @media (max-width: 600px) {
+      .player-table .actions-col {
+        display: none;
+      }
+      
+      .player-table .status-col {
+        display: none;
       }
     }
   </style>
@@ -778,178 +924,199 @@
   </div>
 
   <div class="container">
-    <!-- League Status Section -->
-<!-- League or Tournament Management Section -->
-<div class="section">
-  {% if league_state and not league_state.league_finished %}
-    <h2 class="section-title">🏆 League Management</h2>
-    <div class="league-status">
-      <div class="league-active">🏆 League Active</div>
-      <div class="league-info">
-        <div class="info-item">
-          <div class="info-label">Tournament Type</div>
-          <div class="info-value">
-            {% if league_state.tournament_type == '40_targets' %}
-              40 Targets
-            {% else %}
-              20 Targets
-            {% endif %}
+    <!-- League/Tournament Management Section -->
+    <div class="section">
+      {% if league_state and not league_state.league_finished %}
+        <h2 class="section-title">🏆 League Management</h2>
+        <div class="league-status">
+          <div class="league-active">🏆 League Active</div>
+          <div class="league-info">
+            <div class="info-item">
+              <div class="info-label">Tournament Type</div>
+              <div class="info-value">
+                {% if league_state.tournament_type == '40_targets' %}
+                  40 Targets
+                {% elif league_state.tournament_type == '4_targets' %}
+                  4 Targets
+                {% else %}
+                  20 Targets
+                {% endif %}
+              </div>
+            </div>
+            <div class="info-item">
+              <div class="info-label">Current Tournament</div>
+              <div class="info-value">{{ league_state.current_tournament }} / {{ league_state.total_tournaments }}</div>
+            </div>
+            <div class="info-item">
+              <div class="info-label">Participants</div>
+              <div class="info-value">{{ league_state.participants|length }}</div>
+            </div>
+            <div class="info-item">
+              <div class="info-label">Completed</div>
+              <div class="info-value">{{ league_state.completed_tournaments|length }}</div>
+            </div>
+            <div class="info-item">
+              <div class="info-label">Created</div>
+              <div class="info-value">{{ league_state.created_at[:10] }}</div>
+            </div>
           </div>
-        </div>
-        <div class="info-item">
-          <div class="info-label">Current Tournament</div>
-          <div class="info-value">{{ league_state.current_tournament }} / {{ league_state.total_tournaments }}</div>
-        </div>
-        <div class="info-item">
-          <div class="info-label">Participants</div>
-          <div class="info-value">{{ league_state.participants|length }}</div>
-        </div>
-        <div class="info-item">
-          <div class="info-label">Completed</div>
-          <div class="info-value">{{ league_state.completed_tournaments|length }}</div>
-        </div>
-        <div class="info-item">
-          <div class="info-label">Created</div>
-          <div class="info-value">{{ league_state.created_at[:10] }}</div>
-        </div>
-      </div>
 
-      {% if tournament_state %}
-      {% else %}
-        {% if league_state.current_tournament < league_state.total_tournaments %}
-          <!-- Joker selection -->
-          <div class="joker-section" id="jokerSection">
-            <div class="joker-title">🃏 Joker Selection for Tournament {{ league_state.current_tournament + 1 }}</div>
-            <p style="margin-bottom: 15px; color: #856404;">Select players who will use their joker (skip this tournament). Each player can only use their joker once per league.</p>
+          {% if tournament_state %}
+          {% else %}
+            {% if league_state.current_tournament < league_state.total_tournaments %}
+              <!-- Joker selection -->
+              <div class="joker-section" id="jokerSection">
+                <div class="joker-title">🃏 Joker Selection for Tournament {{ league_state.current_tournament + 1 }}</div>
+                <p style="margin-bottom: 15px; color: #856404;">Select players who will use their joker (skip this tournament). Each player can only use their joker once per league.</p>
 
-            <div class="joker-grid">
-              {% for player_id, participant in league_state.participants.items() %}
-                <div class="joker-player {% if participant.joker_used %}used{% endif %}">
-                  <span>{{ participant.name }}</span>
-                  <input type="checkbox"
-                        class="joker-checkbox"
-                        id="joker_{{ player_id }}"
-                        {% if participant.joker_used %}disabled{% endif %}
-                        data-player-id="{{ player_id }}">
+                <div class="joker-grid">
+                  {% for player_id, participant in league_state.participants.items() %}
+                    <div class="joker-player {% if participant.joker_used %}used{% endif %}">
+                      <span>{{ participant.name }}</span>
+                      <input type="checkbox"
+                            class="joker-checkbox"
+                            id="joker_{{ player_id }}"
+                            {% if participant.joker_used %}disabled{% endif %}
+                            data-player-id="{{ player_id }}">
+                    </div>
+                  {% endfor %}
                 </div>
-              {% endfor %}
+              </div>
+
+              <div class="action-buttons">
+                <button class="action-btn success" onclick="startNextTournament()">
+                  🚀 Start Tournament {{ league_state.current_tournament + 1 }}
+                </button>
+              </div>
+            {% else %}
+              <div class="warning">
+                <strong>League Complete!</strong> All tournaments scheduled. Finish current one to see final results.
+              </div>
+            {% endif %}
+          {% endif %}
+        </div>
+
+      {% elif league_state and league_state.league_finished %}
+        <h2 class="section-title">🏁 League Completed</h2>
+        <div class="league-status">
+          <div class="league-active">🏆 League Completed!</div>
+          <div class="league-info">
+            <div class="info-item">
+              <div class="info-label">Tournament Type</div>
+              <div class="info-value">
+                {% if league_state.tournament_type == '40_targets' %}
+                  40 Targets
+                {% elif league_state.tournament_type == '4_targets' %}
+                  4 Targets
+                {% else %}
+                  20 Targets
+                {% endif %}
+              </div>
+            </div>
+            <div class="info-item">
+              <div class="info-label">Participants</div>
+              <div class="info-value">{{ league_state.participants|length }}</div>
+            </div>
+            <div class="info-item">
+              <div class="info-label">Tournaments</div>
+              <div class="info-value">{{ league_state.total_tournaments }}</div>
+            </div>
+            <div class="info-item">
+              <div class="info-label">Finished</div>
+              <div class="info-value">{{ league_state.finished_at[:10] if league_state.finished_at else 'Today' }}</div>
             </div>
           </div>
 
           <div class="action-buttons">
-            <button class="action-btn success" onclick="startNextTournament()">
-              🚀 Start Tournament {{ league_state.current_tournament + 1 }}
-            </button>
+            <a href="/results" class="action-btn success">🏆 View League Results</a>
+            <button class="action-btn danger" onclick="resetLeague()">🗑️ Reset League</button>
           </div>
-        {% else %}
-          <div class="warning">
-            <strong>League Complete!</strong> All tournaments scheduled. Finish current one to see final results.
+        </div>
+
+      {% elif not league_state and tournament_state %}
+        <h2 class="section-title">🎯 Single Tournament Management</h2>
+        <div class="tournament-status">
+          <div class="tournament-active">🎯 Tournament Active</div>
+          <div class="league-info">
+            <div class="info-item">
+              <div class="info-label">Tournament Type</div>
+              <div class="info-value">
+                {% if tournament_state.tournament_type == '40_targets' %}
+                  40 Targets
+                {% elif tournament_state.tournament_type == '4_targets' %}
+                  4 Targets
+                {% else %}
+                  20 Targets
+                {% endif %}
+              </div>
+            </div>
+            <div class="info-item">
+              <div class="info-label">Players</div>
+              <div class="info-value">{{ tournament_state.total_players }}</div>
+            </div>
+            <div class="info-item">
+              <div class="info-label">Rounds</div>
+              <div class="info-value">{{ tournament_state.total_rounds }}</div>
+            </div>
+            <div class="info-item">
+              <div class="info-label">Current Round</div>
+              <div class="info-value">{{ tournament_state.current_round }}</div>
+            </div>
+            <div class="info-item">
+              <div class="info-label">Created</div>
+              <div class="info-value">{{ tournament_state.created_at[:10] if tournament_state.created_at else 'Today' }}</div>
+            </div>
           </div>
-        {% endif %}
+
+          <div class="action-buttons">
+            <a href="/tournament/draft" class="action-btn">📋 View Draft</a>
+            <a href="/results/calculator" class="action-btn success">🎯 Score Tournament</a>
+            <a href="/" class="action-btn">📺 Dashboard</a>
+            <button class="action-btn danger" onclick="resetTournament()">🗑️ Reset Tournament</button>
+          </div>
+        </div>
+
+      {% else %}
+        <h2 class="section-title">🏁 Setup</h2>
+        <div class="league-inactive">No Active League or Tournament</div>
+
+        <!-- Tournament Type Selection -->
+        <div class="tournament-type-selection">
+          <div class="type-title">🎯 Select Tournament Type</div>
+          <div class="type-options">
+            <div class="type-option" onclick="selectTournamentType('4_targets')">
+              <input type="radio" name="tournament_type" value="4_targets">
+              <div class="type-name">4 Targets</div>
+              <div class="type-description">Quick format with 4 targets, 5 shots each (20 shots total)</div>
+            </div>
+            <div class="type-option selected" onclick="selectTournamentType('20_targets')">
+              <input type="radio" name="tournament_type" value="20_targets" checked>
+              <div class="type-name">20 Targets</div>
+              <div class="type-description">Standard format with 20 targets, 2 shots each (40 shots total)</div>
+            </div>
+            <div class="type-option" onclick="selectTournamentType('40_targets')">
+              <input type="radio" name="tournament_type" value="40_targets">
+              <div class="type-name">40 Targets</div>
+              <div class="type-description">Extended format with 40 targets, 2 shots each (80 shots total)</div>
+            </div>
+          </div>
+        </div>
+
+        <div class="player-count">
+          <span class="enabled-count" id="enabledCount">0</span> players enabled
+        </div>
+
+        <div class="action-buttons">
+          <button class="action-btn success" id="startLeagueBtn" onclick="startLeague()">🏆 Start League (6 Tournaments)</button>
+          <button class="action-btn" id="startSingleBtn" onclick="startSingleTournament()">🎯 Start Single Tournament</button>
+        </div>
+
+        <div class="warning" id="warningMessage" style="display: none;">
+          <strong>Note:</strong> You need at least 1 enabled player to start.
+        </div>
       {% endif %}
     </div>
 
-  {% elif league_state and league_state.league_finished %}
-    <h2 class="section-title">🏁 League Completed</h2>
-    <div class="league-status">
-      <div class="league-active">🏆 League Completed!</div>
-      <div class="league-info">
-        <div class="info-item">
-          <div class="info-label">Tournament Type</div>
-          <div class="info-value">{{ league_state.tournament_type == '40_targets' and '40 Targets' or '20 Targets' }}</div>
-        </div>
-        <div class="info-item">
-          <div class="info-label">Participants</div>
-          <div class="info-value">{{ league_state.participants|length }}</div>
-        </div>
-        <div class="info-item">
-          <div class="info-label">Tournaments</div>
-          <div class="info-value">{{ league_state.total_tournaments }}</div>
-        </div>
-        <div class="info-item">
-          <div class="info-label">Finished</div>
-          <div class="info-value">{{ league_state.finished_at[:10] if league_state.finished_at else 'Today' }}</div>
-        </div>
-      </div>
-
-      <div class="action-buttons">
-        <a href="/results" class="action-btn success">🏆 View League Results</a>
-        <button class="action-btn danger" onclick="resetLeague()">🗑️ Reset League</button>
-      </div>
-    </div>
-
-  {% elif not league_state and tournament_state %}
-    <h2 class="section-title">🎯 Single Tournament Management</h2>
-    <div class="tournament-status">
-      <div class="tournament-active">🎯 Tournament Active</div>
-      <div class="league-info">
-        <div class="info-item">
-          <div class="info-label">Tournament Type</div>
-          <div class="info-value">{{ tournament_state.tournament_type == '40_targets' and '40 Targets' or '20 Targets' }}</div>
-        </div>
-        <div class="info-item">
-          <div class="info-label">Players</div>
-          <div class="info-value">{{ tournament_state.total_players }}</div>
-        </div>
-        <div class="info-item">
-          <div class="info-label">Rounds</div>
-          <div class="info-value">{{ tournament_state.total_rounds }}</div>
-        </div>
-        <div class="info-item">
-          <div class="info-label">Current Round</div>
-          <div class="info-value">{{ tournament_state.current_round }}</div>
-        </div>
-        <div class="info-item">
-          <div class="info-label">Created</div>
-          <div class="info-value">{{ tournament_state.created_at[:10] if tournament_state.created_at else 'Today' }}</div>
-        </div>
-      </div>
-
-      <div class="action-buttons">
-        <a href="/tournament/draft" class="action-btn">📋 View Draft</a>
-        <a href="/results/calculator" class="action-btn success">🎯 Score Tournament</a>
-        <a href="/" class="action-btn">📺 Dashboard</a>
-        <button class="action-btn danger" onclick="resetTournament()">🗑️ Reset Tournament</button>
-      </div>
-    </div>
-
-  {% else %}
-    <h2 class="section-title">🏁 Setup</h2>
-    <div class="league-inactive">No Active League or Tournament</div>
-
-    <!-- Tournament Type Selection -->
-    <div class="tournament-type-selection">
-      <div class="type-title">🎯 Select Tournament Type</div>
-      <div class="type-options">
-        <div class="type-option selected" onclick="selectTournamentType('20_targets')">
-          <input type="radio" name="tournament_type" value="20_targets" checked>
-          <div class="type-name">20 Targets</div>
-          <div class="type-description">Standard format with 20 targets, 2 shots each (40 shots total)</div>
-        </div>
-        <div class="type-option" onclick="selectTournamentType('40_targets')">
-          <input type="radio" name="tournament_type" value="40_targets">
-          <div class="type-name">40 Targets</div>
-          <div class="type-description">Extended format with 40 targets, 2 shots each (80 shots total)</div>
-        </div>
-      </div>
-    </div>
-
-    <div class="player-count">
-      <span class="enabled-count" id="enabledCount">0</span> players enabled
-    </div>
-
-    <div class="action-buttons">
-      <button class="action-btn success" id="startLeagueBtn" onclick="startLeague()">🏆 Start League (6 Tournaments)</button>
-      <button class="action-btn" id="startSingleBtn" onclick="startSingleTournament()">🎯 Start Single Tournament</button>
-    </div>
-
-    <div class="warning" id="warningMessage" style="display: none;">
-      <strong>Note:</strong> You need at least 1 enabled player to start.
-    </div>
-  {% endif %}
-</div>
-
-
     <!-- Current Tournament Status (if active) -->
     {% if tournament_state and league_state %}
     <div class="section">
@@ -963,6 +1130,8 @@
             <div class="info-value">
               {% if tournament_state.tournament_type == '40_targets' %}
                 40 Targets
+              {% elif tournament_state.tournament_type == '4_targets' %}
+                4 Targets
               {% else %}
                 20 Targets
               {% endif %}
@@ -998,29 +1167,92 @@
     </div>
     {% endif %}
 
-    <!-- Player Management Section -->
-     {% if not league_state and not tournament_state %}
+    <!-- Player Management Section - NEW LIST FORMAT -->
+    {% if not league_state and not tournament_state %}
     <div class="section">
       <h2 class="section-title">👥 Player Management</h2>
       
-      <!-- Add Player Form -->
-      <div class="add-player-form">
-        <input type="text" 
-               id="newPlayerName" 
-               placeholder="Enter player name..." 
-               maxlength="50"
-               onkeypress="handleAddPlayerKeypress(event)">
-        <button class="add-btn" id="addPlayerBtn" onclick="addPlayer()">
-          ➕ Add Player
-        </button>
-        <button class="uncheck-all-btn" onclick="uncheckAllPlayers()">
-          ❌ Uncheck All
-        </button>
+      <!-- Add Player Section -->
+      <div class="add-player-section">
+        <h3 style="margin: 0 0 15px 0; color: #333;">Add New Player</h3>
+        <div class="add-player-form">
+          <input type="text" 
+                 id="newPlayerName" 
+                 placeholder="Enter player name..." 
+                 maxlength="50"
+                 onkeypress="handleAddPlayerKeypress(event)">
+          <button class="add-btn" id="addPlayerBtn" onclick="addPlayer()">
+            ➕ Add Player
+          </button>
+        </div>
       </div>
 
-      <!-- Player Grid -->
-      <div class="player-grid" id="playerGrid">
-        <!-- Players will be loaded here -->
+      <!-- Search and Controls -->
+      <div class="player-management-header">
+        <div class="search-container">
+          <input type="text" 
+                 class="search-input" 
+                 id="playerSearch" 
+                 placeholder="Search players by name..."
+                 oninput="filterPlayers()">
+          <span class="search-icon">🔍</span>
+        </div>
+        
+        <div class="player-controls">
+          <button class="filter-btn active" data-filter="all" onclick="setFilter('all')">All</button>
+          <button class="filter-btn" data-filter="enabled" onclick="setFilter('enabled')">Enabled</button>
+          <button class="filter-btn" data-filter="disabled" onclick="setFilter('disabled')">Disabled</button>
+        </div>
+
+        <div class="bulk-actions">
+          <button class="bulk-btn" onclick="selectAllVisible()">Select All</button>
+          <button class="bulk-btn" onclick="enableSelected()">Enable Selected</button>
+          <button class="bulk-btn danger" onclick="disableSelected()">Disable Selected</button>
+        </div>
+      </div>
+
+      <!-- Stats Summary -->
+      <div class="stats-summary">
+        <div class="stat-item">
+          <span class="stat-number stat-total" id="totalPlayersCount">0</span>
+          <span>Total Players</span>
+        </div>
+        <div class="stat-item">
+          <span class="stat-number stat-enabled" id="enabledPlayersCount">0</span>
+          <span>Enabled</span>
+        </div>
+        <div class="stat-item">
+          <span class="stat-number stat-disabled" id="disabledPlayersCount">0</span>
+          <span>Disabled</span>
+        </div>
+        <div class="stat-item">
+          <span class="stat-number" id="visiblePlayersCount">0</span>
+          <span>Visible</span>
+        </div>
+      </div>
+
+      <!-- Player List Table -->
+      <div class="player-list-container">
+        <table class="player-table">
+          <thead>
+            <tr>
+              <th style="width: 40px;">
+                <input type="checkbox" id="selectAllCheckbox" onchange="toggleSelectAll()">
+              </th>
+              <th style="width: 60px;">ID</th>
+              <th>Name</th>
+              <th class="status-col" style="width: 120px;">Status</th>
+              <th class="actions-col" style="width: 200px;">Actions</th>
+            </tr>
+          </thead>
+          <tbody id="playerTableBody">
+            <!-- Players will be populated here -->
+          </tbody>
+        </table>
+        
+        <div class="no-results" id="noResults" style="display: none;">
+          No players found matching your search criteria.
+        </div>
       </div>
     </div>
     {% endif %}
@@ -1045,6 +1277,9 @@
     let pendingAction = null;
     let editingPlayer = null;
     let selectedTournamentType = '20_targets';
+    let currentFilter = 'all';
+    let searchTerm = '';
+    let selectedPlayers = new Set();
 
     // Tournament type selection
     function selectTournamentType(type) {
@@ -1062,12 +1297,164 @@
       if (radio) radio.checked = true;
     }
 
-    // Render players grid
-    function renderPlayerGrid() {
-      const playerGrid = document.getElementById('playerGrid');
-      playerGrid.innerHTML = '';
+    // Filter and search functions
+    function setFilter(filter) {
+      currentFilter = filter;
+      
+      // Update filter buttons
+      document.querySelectorAll('.filter-btn').forEach(btn => {
+        btn.classList.remove('active');
+      });
+      document.querySelector(`[data-filter="${filter}"]`).classList.add('active');
+      
+      renderPlayerTable();
+    }
 
+    function filterPlayers() {
+      searchTerm = document.getElementById('playerSearch').value.toLowerCase();
+      renderPlayerTable();
+    }
+
+    function getFilteredPlayers() {
+      let filtered = players.filter(player => {
+        // Search filter
+        if (searchTerm && !player.name.toLowerCase().includes(searchTerm)) {
+          return false;
+        }
+        
+        // Status filter
+        if (currentFilter === 'enabled' && !player.enabled) {
+          return false;
+        }
+        if (currentFilter === 'disabled' && player.enabled) {
+          return false;
+        }
+        
+        return true;
+      });
+      
+      // Sort by enabled status first, then by name
+      filtered.sort((a, b) => {
+        if (a.enabled && !b.enabled) return -1;
+        if (!a.enabled && b.enabled) return 1;
+        return a.name.localeCompare(b.name);
+      });
+      
+      return filtered;
+    }
+
+    // Selection functions
+    function togglePlayerSelection(playerId, checked) {
+      if (checked) {
+        selectedPlayers.add(playerId);
+      } else {
+        selectedPlayers.delete(playerId);
+      }
+      updateSelectAllCheckbox();
+    }
+
+    function toggleSelectAll() {
+      const selectAllCheckbox = document.getElementById('selectAllCheckbox');
+      const visiblePlayers = getFilteredPlayers();
+      
+      if (selectAllCheckbox.checked) {
+        visiblePlayers.forEach(player => selectedPlayers.add(player.id));
+      } else {
+        visiblePlayers.forEach(player => selectedPlayers.delete(player.id));
+      }
+      
+      renderPlayerTable();
+    }
+
+    function selectAllVisible() {
+      const visiblePlayers = getFilteredPlayers();
+      visiblePlayers.forEach(player => selectedPlayers.add(player.id));
+      renderPlayerTable();
+    }
+
+    function updateSelectAllCheckbox() {
+      const selectAllCheckbox = document.getElementById('selectAllCheckbox');
+      const visiblePlayers = getFilteredPlayers();
+      const selectedVisible = visiblePlayers.filter(p => selectedPlayers.has(p.id));
+      
+      if (selectedVisible.length === 0) {
+        selectAllCheckbox.checked = false;
+        selectAllCheckbox.indeterminate = false;
+      } else if (selectedVisible.length === visiblePlayers.length) {
+        selectAllCheckbox.checked = true;
+        selectAllCheckbox.indeterminate = false;
+      } else {
+        selectAllCheckbox.checked = false;
+        selectAllCheckbox.indeterminate = true;
+      }
+    }
+
+    // Bulk actions
+    function enableSelected() {
+      if (selectedPlayers.size === 0) {
+        alert('No players selected');
+        return;
+      }
+      
+      if (!confirm(`Enable ${selectedPlayers.size} selected players?`)) {
+        return;
+      }
+      
+      bulkUpdatePlayers(Array.from(selectedPlayers), true);
+    }
+
+    function disableSelected() {
+      if (selectedPlayers.size === 0) {
+        alert('No players selected');
+        return;
+      }
+      
+      if (!confirm(`Disable ${selectedPlayers.size} selected players?`)) {
+        return;
+      }
+      
+      bulkUpdatePlayers(Array.from(selectedPlayers), false);
+    }
+
+    async function bulkUpdatePlayers(playerIds, enabled) {
+      try {
+        for (const playerId of playerIds) {
+          const response = await fetch(`/api/players/${playerId}`, {
+            method: 'POST',
+            headers: {
+              'Content-Type': 'application/json',
+            },
+            body: JSON.stringify({ enabled: enabled })
+          });
+
+          if (response.ok) {
+            const player = players.find(p => p.id === playerId);
+            if (player) {
+              player.enabled = enabled;
+            }
+          }
+        }
+        
+        selectedPlayers.clear();
+        renderPlayerTable();
+        updateStats();
+      } catch (error) {
+        console.error('Error bulk updating players:', error);
+        alert('Error updating players. Please try again.');
+      }
+    }
+
+    // Update stats display
+    function updateStats() {
+      const totalCount = players.length;
       const enabledCount = players.filter(p => p.enabled).length;
+      const disabledCount = totalCount - enabledCount;
+      const visibleCount = getFilteredPlayers().length;
+
+      document.getElementById('totalPlayersCount').textContent = totalCount;
+      document.getElementById('enabledPlayersCount').textContent = enabledCount;
+      document.getElementById('disabledPlayersCount').textContent = disabledCount;
+      document.getElementById('visiblePlayersCount').textContent = visibleCount;
       document.getElementById('enabledCount').textContent = enabledCount;
 
       // Update button states
@@ -1086,44 +1473,70 @@
           warningMsg.style.display = 'none';
         }
       }
+    }
 
-      players.forEach(player => {
-        const card = document.createElement('div');
-        card.className = `player-card ${player.enabled ? 'competing' : 'not-competing'}`;
+    // Render the player table
+    function renderPlayerTable() {
+      const tbody = document.getElementById('playerTableBody');
+      const noResults = document.getElementById('noResults');
+      const filteredPlayers = getFilteredPlayers();
+      
+      tbody.innerHTML = '';
+      
+      if (filteredPlayers.length === 0) {
+        noResults.style.display = 'block';
+        return;
+      } else {
+        noResults.style.display = 'none';
+      }
+
+      filteredPlayers.forEach(player => {
+        const row = document.createElement('tr');
+        row.className = player.enabled ? 'enabled' : 'disabled';
         
-        card.innerHTML = `
-          <div class="player-header">
-            <div class="player-id-badge">#${player.id}</div>
-            <div class="player-status ${player.enabled ? 'status-competing' : 'status-not-competing'}">
-              ${player.enabled ? '✓ Competing' : '✗ Not Competing'}
+        row.innerHTML = `
+          <td>
+            <input type="checkbox" 
+                   ${selectedPlayers.has(player.id) ? 'checked' : ''}
+                   onchange="togglePlayerSelection(${player.id}, this.checked)">
+          </td>
+          <td class="player-id">#${player.id}</td>
+          <td class="player-name" id="playerName${player.id}">
+            ${player.name}
+          </td>
+          <td class="player-status status-col">
+            <span class="status-badge ${player.enabled ? 'status-enabled' : 'status-disabled'}">
+              ${player.enabled ? '✓ Enabled' : '✗ Disabled'}
+            </span>
+          </td>
+          <td class="player-actions actions-col">
+            <div class="action-toggle">
+              <div class="toggle-switch ${player.enabled ? 'enabled' : ''}" 
+                   onclick="togglePlayer(${player.id})"></div>
+              <span style="font-size: 0.9rem; color: #666;">
+                ${player.enabled ? 'Competing' : 'Not competing'}
+              </span>
             </div>
-          </div>
-          
-          <div class="player-name-section">
-            <div class="player-name" id="playerName${player.id}">
-              ${player.name}
-            </div>
-          </div>
-          
-          <div class="player-controls">
-            <div class="competing-toggle" onclick="togglePlayer(${player.id})">
-              <input type="checkbox" class="toggle-checkbox" ${player.enabled ? 'checked' : ''} onchange="togglePlayer(${player.id})">
-              <span class="toggle-label">Competing</span>
-            </div>
-            
-            <div class="card-buttons">
-              <button class="edit-btn" onclick="editPlayer(${player.id})" title="Edit Player Name">
+            <div class="action-buttons-cell">
+              <button class="action-btn-small edit-btn-small" 
+                      onclick="editPlayer(${player.id})" 
+                      title="Edit Player Name">
                 ✏️ Edit
               </button>
-              <button class="delete-btn" onclick="confirmDeletePlayer(${player.id})" title="Delete Player">
+              <button class="action-btn-small delete-btn-small" 
+                      onclick="confirmDeletePlayer(${player.id})" 
+                      title="Delete Player">
                 🗑️ Delete
               </button>
             </div>
-          </div>
+          </td>
         `;
         
-        playerGrid.appendChild(card);
+        tbody.appendChild(row);
       });
+
+      updateSelectAllCheckbox();
+      updateStats();
     }
 
     // Add new player
@@ -1153,7 +1566,7 @@
           const result = await response.json();
           players.push(result.player);
           nameInput.value = '';
-          renderPlayerGrid();
+          renderPlayerTable();
         } else {
           const error = await response.json();
           alert('Failed to add player: ' + error.message);
@@ -1190,12 +1603,13 @@
             updatePlayerName(playerId, newName);
           } else {
             editingPlayer = null;
-            renderPlayerGrid();
+            renderPlayerTable();
           }
         }
       } else {
         // Start editing
         editingPlayer = playerId;
+        nameElement.className = 'player-name editing';
         nameElement.innerHTML = `
           <input type="text" value="${player.name}" maxlength="50" 
                  onblur="savePlayerName(${playerId})" 
@@ -1215,7 +1629,7 @@
         editPlayer(playerId);
       } else if (event.key === 'Escape') {
         editingPlayer = null;
-        renderPlayerGrid();
+        renderPlayerTable();
       }
     }
 
@@ -1237,16 +1651,16 @@
             player.name = newName.trim();
           }
           editingPlayer = null;
-          renderPlayerGrid();
+          renderPlayerTable();
         } else {
           alert('Failed to update player name');
           editingPlayer = null;
-          renderPlayerGrid();
+          renderPlayerTable();
         }
       } catch (error) {
         console.error('Error updating player:', error);
         editingPlayer = null;
-        renderPlayerGrid();
+        renderPlayerTable();
       }
     }
 
@@ -1268,7 +1682,7 @@
 
         if (response.ok) {
           player.enabled = newEnabled;
-          renderPlayerGrid();
+          renderPlayerTable();
         } else {
           alert('Failed to update player status');
         }
@@ -1278,42 +1692,6 @@
       }
     }
 
-    // Uncheck all players
-    async function uncheckAllPlayers() {
-      const competingPlayers = players.filter(p => p.enabled);
-      
-      if (competingPlayers.length === 0) {
-        alert('No players are currently competing');
-        return;
-      }
-
-      if (!confirm(`Are you sure you want to uncheck all ${competingPlayers.length} competing players?`)) {
-        return;
-      }
-
-      try {
-        // Update each player that is currently enabled
-        for (const player of competingPlayers) {
-          const response = await fetch(`/api/players/${player.id}`, {
-            method: 'POST',
-            headers: {
-              'Content-Type': 'application/json',
-            },
-            body: JSON.stringify({ enabled: false })
-          });
-
-          if (response.ok) {
-            player.enabled = false;
-          }
-        }
-        
-        renderPlayerGrid();
-      } catch (error) {
-        console.error('Error unchecking players:', error);
-        alert('Error unchecking players. Please try again.');
-      }
-    }
-
     // Confirm delete player
     function confirmDeletePlayer(playerId) {
       const player = players.find(p => p.id === playerId);
@@ -1338,7 +1716,8 @@
 
         if (response.ok) {
           players = players.filter(p => p.id !== playerId);
-          renderPlayerGrid();
+          selectedPlayers.delete(playerId);
+          renderPlayerTable();
           closeModal();
         } else {
           alert('Failed to delete player');
@@ -1358,7 +1737,11 @@
         return;
       }
 
-      if (!confirm(`Start league with ${enabledPlayers.length} players using ${selectedTournamentType === '40_targets' ? '40' : '20'} targets format?`)) {
+      const formatText = selectedTournamentType === '40_targets' ? '40 targets (80 shots)' :
+                        selectedTournamentType === '4_targets' ? '4 targets (20 shots)' :
+                        '20 targets (40 shots)';
+
+      if (!confirm(`Start league with ${enabledPlayers.length} players using ${formatText} format?`)) {
         return;
       }
 
@@ -1401,7 +1784,11 @@
         return;
       }
 
-      if (!confirm(`Start single tournament with ${enabledPlayers.length} players using ${selectedTournamentType === '40_targets' ? '40' : '20'} targets format?`)) {
+      const formatText = selectedTournamentType === '40_targets' ? '40 targets (80 shots)' :
+                        selectedTournamentType === '4_targets' ? '4 targets (20 shots)' :
+                        '20 targets (40 shots)';
+
+      if (!confirm(`Start single tournament with ${enabledPlayers.length} players using ${formatText} format?`)) {
         return;
       }
 
@@ -1548,7 +1935,7 @@
 
     // Initialize page
     document.addEventListener('DOMContentLoaded', function() {
-      renderPlayerGrid();
+      renderPlayerTable();
       
       // Focus on add player input if no active league/tournament
       const nameInput = document.getElementById('newPlayerName');