diff --git a/web/app/assets/javascripts/fakeJamClient.js b/web/app/assets/javascripts/fakeJamClient.js
index e571976b2..8347edae5 100644
--- a/web/app/assets/javascripts/fakeJamClient.js
+++ b/web/app/assets/javascripts/fakeJamClient.js
@@ -4,6 +4,7 @@
 
     context.JK = context.JK || {};
     context.JK.FakeJamClient = function(app, p2pMessageFactory) {
+        var ChannelGroupIds = context.JK.ChannelGroupIds;
         var logger = context.JK.logger;
         logger.info("*** Fake JamClient instance initialized. ***");
 
@@ -474,7 +475,18 @@
         }
         function SessionGetControlState(mixerIds, isMasterOrPersonal) {
             dbg("SessionGetControlState");
-            var groups = [0, 1, 2, 3, 3, 7, 8, 10, 11, 12];
+            var groups = [
+              ChannelGroupIds.MasterGroup,
+              ChannelGroupIds.MonitorGroup,
+              ChannelGroupIds.AudioInputMusicGroup,
+              ChannelGroupIds.AudioInputChatGroup,
+              ChannelGroupIds.AudioInputChatGroup,
+              ChannelGroupIds.UserMusicInputGroup,
+              ChannelGroupIds.UserChatInputGroup,
+              ChannelGroupIds.PeerMediaTrackGroup,
+              ChannelGroupIds.JamTrackGroup,
+              ChannelGroupIds.MetronomeGroup
+              ]
             var names = [
                 "FW AP Multi",
                 "FW AP Multi",
diff --git a/web/app/assets/javascripts/globals.js b/web/app/assets/javascripts/globals.js
index 85ebcc250..3642ea37a 100644
--- a/web/app/assets/javascripts/globals.js
+++ b/web/app/assets/javascripts/globals.js
@@ -313,4 +313,26 @@
   context.JK.NAMED_MESSAGES = {
     MASTER_VS_PERSONAL_MIX : 'master_vs_personal_mix'
   }
+
+  // Recreate ChannelGroupIDs ENUM from C++
+  context.JK.ChannelGroupIds =
+  {
+    "MasterGroup": 0,
+    "MonitorGroup": 1,
+    "MasterCatGroup": 2,
+    "MonitorCatGroup": 3,
+    "AudioInputMusicGroup": 4,
+    "AudioInputChatGroup": 5,
+    "MediaTrackGroup": 6,
+    "StreamOutMusicGroup": 7,
+    "StreamOutChatGroup": 8,
+    "StreamOutMediaGroup": 9,
+    "UserMusicInputGroup": 10,
+    "UserChatInputGroup": 11,
+    "UserMediaInputGroup": 12,
+    "PeerAudioInputMusicGroup": 13,
+    "PeerMediaTrackGroup": 14,
+    "JamTrackGroup": 15,
+    "MetronomeGroup": 16
+  };
  })(window,jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/session.js b/web/app/assets/javascripts/session.js
index a00991840..1827758af 100644
--- a/web/app/assets/javascripts/session.js
+++ b/web/app/assets/javascripts/session.js
@@ -14,6 +14,7 @@
         var logger = context.JK.logger;
         var self = this;
         var webcamViewer = new context.JK.WebcamViewer()
+        var ChannelGroupIds = context.JK.ChannelGroupIds;
         
         var defaultParticipant = {
           tracks: [{
@@ -39,23 +40,6 @@
           height: 83
         };
 
-        // Recreate ChannelGroupIDs ENUM from C++
-        var ChannelGroupIds = {
-          "MasterGroup": 0,
-          "MonitorGroup": 1,
-          "AudioInputMusicGroup": 2,
-          "AudioInputChatGroup": 3,
-          "MediaTrackGroup": 4,
-          "StreamOutMusicGroup": 5,
-          "StreamOutChatGroup": 6,
-          "UserMusicInputGroup": 7,
-          "UserChatInputGroup": 8,
-          "PeerAudioInputMusicGroup": 9,
-          "PeerMediaTrackGroup": 10,
-          "JamTrackGroup": 11,
-          "MetronomeGroup": 12
-        };
-
         var METRO_SOUND_LOOKUP = {
           0 : "BuiltIn",
           1 : "SineWave",
diff --git a/web/app/assets/javascripts/trackHelpers.js b/web/app/assets/javascripts/trackHelpers.js
index b434d80a9..b6c61385e 100644
--- a/web/app/assets/javascripts/trackHelpers.js
+++ b/web/app/assets/javascripts/trackHelpers.js
@@ -20,7 +20,7 @@
 
           var userTracks = context.JK.TrackHelpers.getUserTracks(jamClient, allTracks);
           var backingTracks = context.JK.TrackHelpers.getBackingTracks(jamClient, allTracks);
-          var metronomeTracks = context.JK.TrackHelpers.getTracks(jamClient, 12);
+          var metronomeTracks = context.JK.TrackHelpers.getTracks(jamClient, 16);
 
           return {
             userTracks: userTracks,
@@ -51,7 +51,7 @@
 
       // allTracks is the result of SessionGetAllControlState; as an optimization
         getBackingTracks: function(jamClient, allTracks) {
-            var mediaTracks  = context.JK.TrackHelpers.getTracks(jamClient, 4, allTracks);
+            var mediaTracks  = context.JK.TrackHelpers.getTracks(jamClient, 6, allTracks);
 
             var backingTracks = []
             context._.each(mediaTracks, function(mediaTrack) {
@@ -80,7 +80,7 @@
             var localMusicTracks = [];
             var i;
 
-            localMusicTracks = context.JK.TrackHelpers.getTracks(jamClient, 2, allTracks);
+            localMusicTracks = context.JK.TrackHelpers.getTracks(jamClient, 4, allTracks);
 
             var trackObjects = [];