diff --git a/src/App.tsx b/src/App.tsx
index 95be657..443cabf 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -65,7 +65,7 @@ function App() {
 
     for (const file of files) {
       try {
-        // Read the raw bytes first — needed for both hashing and decoding.
+        // Read the raw bytes first - needed for both hashing and decoding.
         const arrayBuffer = await file.arrayBuffer();
 
         // Hash and metadata extraction can run in parallel.
diff --git a/src/components/HelpModal.tsx b/src/components/HelpModal.tsx
index 9fb603d..4d716a9 100644
--- a/src/components/HelpModal.tsx
+++ b/src/components/HelpModal.tsx
@@ -50,83 +50,132 @@ export default function HelpModal({ onClose }: HelpModalProps) {
 
         {/* Content */}
         <div className="help-modal-content">
+          {/* Getting Started */}
           <section className="help-section">
             <h3 className="help-section-title">Getting Started</h3>
             <p className="help-text">
-              DJ AMBER is a powerful music mixing and sequencing tool. Use it to create, edit, and
-              play custom music tracks with layered clips and effects.
+              DJ AMBER is a music mixing and sequencing tool for creating layered audio tracks and
+              smooth transitions.
             </p>
+            <ul className="help-tips">
+              <li>Upload or browse clips from the Music Library</li>
+              <li>Drag clips onto the Timeline to begin building your track</li>
+              <li>Arrange and adjust clips to shape your final mix</li>
+            </ul>
           </section>
 
+          {/* Controls */}
           <section className="help-section">
-            <h3 className="help-section-title">Music Library</h3>
+            <h3 className="help-section-title">Controls</h3>
             <p className="help-text">
-              Browse and select audio clips from the Music Library panel on the left. Search for
-              clips by name or category to quickly find what you need.
+              Use keyboard and navigation controls to work quickly and precisely.
             </p>
+
+            <div className="help-subsection">
+              <h4 className="help-subsection-title">Keyboard Shortcuts</h4>
+              <ul className="help-tips">
+                <li>
+                  <kbd>Spacebar</kbd> - Play or pause playback
+                </li>
+                <li>
+                  <kbd>Esc</kbd> - Close the help modal or deselect a clip
+                </li>
+                <li>
+                  <kbd>Alt</kbd> + drag - Overlap clips freely without pushing others
+                </li>
+                <li>
+                  <kbd>Delete</kbd> / <kbd>Backspace</kbd> - Remove selected clip
+                </li>
+              </ul>
+            </div>
+
+            <div className="help-subsection">
+              <h4 className="help-subsection-title">Timeline Navigation</h4>
+              <ul className="help-tips">
+                <li>
+                  <kbd>Scroll</kbd> - Zoom in and out of the timeline
+                </li>
+                <li>
+                  <kbd>Shift</kbd> + <kbd>Scroll</kbd> - Pan earlier or later
+                </li>
+                <li>Use horizontal trackpad gestures to pan the timeline</li>
+              </ul>
+            </div>
           </section>
 
+          {/* Music Library */}
           <section className="help-section">
-            <h3 className="help-section-title">Timeline</h3>
+            <h3 className="help-section-title">Music Library</h3>
             <p className="help-text">
-              Drag clips from the Music Library onto the Timeline to add them to your project. Use
-              the Timeline to arrange clips, set timing, and create your composition.
+              The Music Library lets you browse and add audio clips to your project.
             </p>
+            <ul className="help-tips">
+              <li>Search for clips by name or category</li>
+              <li>
+                Click the <strong>+</strong> button to add a clip to your project
+              </li>
+              <li>Drag clips directly onto the Timeline to place them</li>
+            </ul>
           </section>
 
+          {/* Timeline */}
           <section className="help-section">
-            <h3 className="help-section-title">Now Playing</h3>
+            <h3 className="help-section-title">Timeline</h3>
             <p className="help-text">
-              The Now Playing panel displays the currently selected track with playback controls,
-              progress bar, and real-time lyrics display. Use the play and pause buttons to control
-              playback.
+              The Timeline is where you arrange and shape your composition.
             </p>
+            <ul className="help-tips">
+              <li>Position clips to control timing and sequence</li>
+              <li>Adjust clip edges to refine transitions</li>
+              <li>Layer clips to create more complex soundscapes</li>
+            </ul>
           </section>
 
+          {/* Set List */}
           <section className="help-section">
-            <h3 className="help-section-title">Keyboard Shortcuts</h3>
-            <ul className="help-shortcuts">
-              <li>
-                <kbd>Spacebar</kbd> - Play/Pause
-              </li>
-              <li>
-                <kbd>Esc</kbd> - Close this help modal / deselect clip
-              </li>
+            <h3 className="help-section-title">Set List</h3>
+            <p className="help-text">
+              The Set List controls the order and playback behavior of tracks in your project.
+            </p>
+            <ul className="help-tips">
               <li>
-                <kbd>Alt</kbd> + drag clip - Slip mode: let the clip overlap freely with the next
-                clip instead of pushing it along
+                Create a new set list using the <strong>+</strong> button
               </li>
+              <li>Drag and drop tracks to reorder them</li>
               <li>
-                <kbd>Delete</kbd> / <kbd>Backspace</kbd> - Delete selected clip
+                Use Shuffle to randomize playback order without interrupting the current track
               </li>
+              <li>Use Repeat to cycle between repeating one track, all tracks, or none</li>
             </ul>
           </section>
 
+          {/* Now Playing */}
           <section className="help-section">
-            <h3 className="help-section-title">Timeline Navigation</h3>
-            <ul className="help-shortcuts">
-              <li>
-                <kbd>Scroll</kbd> - Zoom in / out
-              </li>
-              <li>
-                <kbd>Shift</kbd> + <kbd>Scroll</kbd> - Pan earlier / later
-              </li>
-              <li>Horizontal trackpad swipe also pans the timeline</li>
+            <h3 className="help-section-title">Now Playing</h3>
+            <p className="help-text">
+              The Now Playing panel shows the active track and playback controls.
+            </p>
+            <ul className="help-tips">
+              <li>Use play and pause to control playback</li>
+              <li>Track progress using the playback bar</li>
+              <li>Navigate within a track using the progress bar</li>
             </ul>
           </section>
 
+          {/* Tips & Tricks */}
           <section className="help-section">
             <h3 className="help-section-title">Tips & Tricks</h3>
+            <p className="help-text">
+              These tips can help you create smoother and more polished mixes.
+            </p>
             <ul className="help-tips">
-              <li>Layer multiple clips to create rich soundscapes</li>
-              <li>Adjust timing and fades for smooth transitions</li>
-              <li>Use the progress bar to navigate through your project</li>
+              <li>Layer clips to create richer sound combinations</li>
+              <li>Fine-tune timing and fades for smoother transitions</li>
+              <li>Use the progress bar to quickly navigate your project</li>
               <li>
-                Dragging a clip on the timeline only edits the transition on its left side. Clips to
-                the right ripple along to preserve their existing transitions. Hold <kbd>Alt</kbd>{' '}
-                while dragging to override and let the clip overlap freely.
+                Dragging a clip edits the transition on its left side while preserving others. Hold{' '}
+                <kbd>Alt</kbd> to override and overlap freely.
               </li>
-              <li>Save your projects frequently to avoid losing work</li>
             </ul>
           </section>
         </div>
diff --git a/src/components/NavBar.tsx b/src/components/NavBar.tsx
index 4e9b304..9cdd828 100644
--- a/src/components/NavBar.tsx
+++ b/src/components/NavBar.tsx
@@ -62,7 +62,7 @@ export default function NavBar({ masterVolume, onMasterVolumeChange }: NavBarPro
             title="Help"
             aria-label="Open help modal"
           >
-            ?
+            FAQ
           </button>
         </div>
       </nav>
diff --git a/src/styles/help-modal.css b/src/styles/help-modal.css
index 9017721..1178e3b 100644
--- a/src/styles/help-modal.css
+++ b/src/styles/help-modal.css
@@ -206,3 +206,16 @@ kbd {
 .help-modal-button:active {
   transform: scale(0.98);
 }
+
+.help-subsection {
+  display: flex;
+  flex-direction: column;
+  gap: var(--space-2);
+}
+
+.help-subsection-title {
+  font-size: var(--fs-md);
+  font-weight: var(--fw-semibold);
+  color: #ffffff;
+  margin: 0;
+}