diff --git a/Primary-Application.md b/Primary-Application.md
index 5459494..264b055 100644
--- a/Primary-Application.md
+++ b/Primary-Application.md
@@ -7,15 +7,22 @@ The following sections detail how to use the features available in the sdrtrunk
 * [Menus](#menus)
 * [Spectral & Waterfall Display Panels](#spectral--waterfall-display-panels)
   * [Spectral Display Panel](#spectral-display-panel)
-    * [Spectral Display Context Menus](#spectral-display-context-menus)
+    * [Spectral Display - Context Menus](#spectral-display---context-menus)
   * [Waterfall Display Panel](#waterfall-display-panel)
-    * [Waterfall Context Menu](#waterfall-context-menu)
+    * [Waterfall - Context Menus](#waterfall---context-menus)
   * [Zooming - Spectral and Waterfall Display](#zooming---spectral-and-waterfall-display)
 * [Audio Playback Panel](#audio-playback-panel)
-  * [Audio Playback Panel - Context Menu](#audio-playback-panel---context-menu)
+  * [Audio Playback Panel - Context Menus](#audio-playback-panel---context-menus)
 * [Tabbed Views](#tabbed-views)
   * [Now Playing](#now-playing)
+    * [Decoding Channels Table](#decoding-channels-table)
+    * [Selected Channel - Tabbed Views](#selected-channel---tabbed-views)
+    * [Selected Channel - Details View](#selected-channel---details-view)
+    * [Selected Channel - Events View](#selected-channel---events-view)
+    * [Selected Channel - Messages View](#selected-channel---messages-view)
+    * [Selected Channel - Channel View](#selected-channel---channel-view)
   * [Map](#map)
+    * [Map Controls](#map-controls)
   * [Tuners](#tuners)
   * [Playlist Editor](#playlist-editor)
 * [Streaming Status Panel](#streaming-status-panel)