diff --git a/data/interfaces/default/current_activity_instance.html b/data/interfaces/default/current_activity_instance.html
index 30a7570e..ae4d0b8c 100644
--- a/data/interfaces/default/current_activity_instance.html
+++ b/data/interfaces/default/current_activity_instance.html
@@ -135,79 +135,39 @@ DOCUMENTATION :: END
                                     % endif
                                 </span>
                             </div>
-                            % if data['media_type'] == 'track':
-                            % if data['audio_decision'] == 'direct play':
-                            Stream &nbsp;<strong>Direct Play</strong>
-                            % elif data['audio_decision'] == 'copy':
-                            Stream &nbsp;<strong>Direct Stream</strong>
-                            % else:
-                            Stream &nbsp;<strong>
-                                Transcoding
-                                <span id="transcode-state-${data['session_key']}">
-                                    (Speed: ${data['transcode_speed']})
+                            <span id="transcode-state-${data['session_key']}">
+                                % if data['video_decision'] == 'transcode' or data['audio_decision'] == 'transcode':
+                                Stream &nbsp;<strong>Transcode (Speed: ${data['transcode_speed']})
                                     % if data['throttled'] == '1':
                                     (Throttled)
                                     % endif
-                                </span>
-                            </strong>
-                            % endif
-                            <br />
-                            % if data['audio_decision'] == 'direct play':
-                            Audio &nbsp;<strong>Direct Play (${data['audio_codec']}) (${data['audio_channels']}ch)</strong>
-                            % elif data['audio_decision'] == 'copy':
-                            Audio &nbsp;<strong>Direct Stream (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
-                            % elif data['audio_decision'] == 'transcode':
-                            Audio &nbsp;<strong>Transcode (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
-                            % endif
-                            % elif data['media_type'] == 'episode' or data['media_type'] == 'movie' or data['media_type'] == 'clip':
-                            % if data['video_decision'] == 'direct play' and data['audio_decision'] == 'direct play':
-                            Stream &nbsp;<strong>Direct Play</strong>
-                            % elif data['video_decision'] == 'copy' and data['audio_decision'] == 'copy':
-                            Stream &nbsp;<strong>Direct Stream</strong>
-                            % else:
-                            Stream &nbsp;<strong>
-                                Transcoding
-                                <span id="transcode-state-${data['session_key']}">
-                                    (Speed: ${data['transcode_speed']})
-                                    % if data['throttled'] == '1':
-                                    (Throttled)
+                                    </strong>
+                                % elif data['video_decision'] == 'copy' or data['audio_decision'] == 'copy':
+                                Stream &nbsp;<strong>Direct Stream</strong>
+                                % else:
+                                Stream &nbsp;<strong>Direct Play</strong>
+                                % endif
+                                <br />
+                                % if data['video_decision'] and data['media_type'] != 'photo':
+                                    % if data['video_decision'] == 'transcode':
+                                    Video &nbsp;<strong>Transcode (${data['transcode_video_codec']}) (${data['transcode_width']}x${data['transcode_height']})</strong>
+                                    % elif data['video_decision'] == 'copy':
+                                    Video &nbsp;<strong>Direct Stream (${data['transcode_video_codec']}) (${data['width']}x${data['height']})</strong>
+                                    % else:
+                                    Video &nbsp;<strong>Direct Play (${data['video_codec']}) (${data['width']}x${data['height']})</strong>
                                     % endif
-                                </span>
-                            </strong>
-                            % endif
-                            <br />
-                            % if data['video_decision'] == 'direct play':
-                            Video &nbsp;<strong>Direct Play (${data['video_codec']}) (${data['width']}x${data['height']})</strong>
-                            % elif data['video_decision'] == 'copy':
-                            Video &nbsp;<strong>Direct Stream (${data['transcode_video_codec']}) (${data['width']}x${data['height']})</strong>
-                            % elif data['video_decision'] == 'transcode':
-                            Video &nbsp;<strong>Transcode (${data['transcode_video_codec']}) (${data['transcode_width']}x${data['transcode_height']})</strong>
-                            % endif
-                            <br />
-                            % if data['audio_decision'] == 'direct play':
-                            Audio &nbsp;<strong>Direct Play (${data['audio_codec']}) (${data['audio_channels']}ch)</strong>
-                            % elif data['audio_decision'] == 'copy':
-                            Audio &nbsp;<strong>Direct Stream (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
-                            % elif data['audio_decision'] == 'transcode':
-                            Audio &nbsp;<strong>Transcode (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
-                            % endif
-                            % elif data['media_type'] == 'photo':
-                            % if data['video_decision'] == 'direct play':
-                            Stream &nbsp;<strong>Direct Play</strong>
-                            % elif data['video_decision'] == 'copy':
-                            Stream &nbsp;<strong>Direct Stream</strong>
-                            % else:
-                            Stream &nbsp;<strong>
-                                <span id="transcode-state-${data['session_key']}">
-                                    (Speed: ${data['transcode_speed']})
-                                    % if data['throttled'] == '1':
-                                    (Throttled)
+                                <br />
+                                % endif
+                                % if data['audio_decision']:
+                                    % if data['audio_decision'] == 'transcode':
+                                    Audio &nbsp;<strong>Transcode (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
+                                    % elif data['audio_decision'] == 'copy':
+                                    Audio &nbsp;<strong>Direct Stream (${data['transcode_audio_codec']}) (${data['transcode_audio_channels']}ch)</strong>
+                                    % else:
+                                    Audio &nbsp;<strong>Direct Play (${data['audio_codec']}) (${data['audio_channels']}ch)</strong>
                                     % endif
-                                </span>
-                            </strong>
-                            % endif
-                            % endif
-                            <br>
+                                % endif
+                            </span>
                         </div>
                     </div>
                     % if data['media_type'] != 'photo':
diff --git a/data/interfaces/default/index.html b/data/interfaces/default/index.html
index 501d9a57..d7a597b8 100644
--- a/data/interfaces/default/index.html
+++ b/data/interfaces/default/index.html
@@ -169,10 +169,34 @@
                         }
 
                         // if transcoding, update the transcode state
+                        var ts = '';
                         if (s.video_decision == 'transcode' || s.audio_decision == 'transcode') {
                             var throttled = (s.throttled == '1') ? ' (Throttled)' : '';
-                            $('#transcode-state-' + key).html('(Speed: ' + s.transcode_speed + ')' + throttled);
+                            ts += 'Stream &nbsp;<strong>Transcode (Speed: ' + s.transcode_speed + ')' + throttled + '</strong><br>';
+                        } else if (s.video_decision == 'copy' || s.audio_decision == 'copy') {
+                            ts += 'Stream &nbsp;<strong>Direct Stream</strong><br>';
+                        } else {
+                            ts += 'Stream &nbsp;<strong>Direct Play</strong><br>';
                         }
+                        if (s.video_decision != '' && s.media_type != 'photo') {
+                            if (s.video_decision == 'transcode') {
+                                ts += 'Video &nbsp;<strong>Transcode (' + s.transcode_video_codec + ') (' + s.transcode_width + 'x' + s.transcode_height + ')</strong><br>';
+                            } else if (s.video_decision == 'copy') {
+                                ts += 'Video &nbsp;<strong>Direct Stream (' + s.transcode_video_codec + ') (' + s.width + 'x' + s.height + ')</strong><br>';
+                            } else {
+                                ts += 'Video &nbsp;<strong>Direct Play (' + s.video_codec + ') (' + s.width + 'x' + s.height + ')</strong><br>';
+                            }
+                        }
+                        if (s.audio_decision != '') {
+                            if (s.audio_decision == 'transcode') {
+                                ts += 'Audio &nbsp;<strong>Transcode (' + s.transcode_audio_codec + ') (' + s.transcode_audio_channels + 'ch)</strong>';
+                            } else if (s.audio_decision == 'copy') {
+                                ts += 'Audio &nbsp;<strong>Direct Stream (' + s.transcode_audio_codec + ') (' + s.transcode_audio_channels + 'ch)</strong>';
+                            } else {
+                                ts += 'Audio &nbsp;<strong>Direct Play (' + s.audio_codec + ') (' + s.audio_channels + 'ch)</strong>';
+                            }
+                        }
+                        $('#transcode-state-' + key).html(ts);
 
                         // update the stream progress times
                         $('#stream-eta-' + key).html(moment().add(parseInt(s.duration) - parseInt(s.view_offset), 'milliseconds').format(time_format));