diff --git a/components/JFVideo.brs b/components/JFVideo.brs
index b4de92963..30991a9e2 100644
--- a/components/JFVideo.brs
+++ b/components/JFVideo.brs
@@ -131,6 +131,7 @@ end sub
 '
 ' When Video Player state changes
 sub onState(msg)
+    m.captionTask.playerState = m.top.state
     ' When buffering, start timer to monitor buffering process
     if m.top.state = "buffering" and m.bufferCheckTimer <> invalid
 
diff --git a/components/JFVideo.xml b/components/JFVideo.xml
index 1c5530d4d..fba53c1c9 100644
--- a/components/JFVideo.xml
+++ b/components/JFVideo.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <component name="JFVideo" extends="Video">
   <interface>
     <field id="backPressed" type="boolean" alwaysNotify="true" />
@@ -33,16 +33,20 @@
 
   <children>
 
-    <LayoutGroup horizAlignment = "center" vertAlignment = "center" translation="[960,980]">
-      <Rectangle id = "captionBG" color = "#323232BF" height = "0" width="0"/>
-    </LayoutGroup>
-    <LayoutGroup id="captionGroup" horizAlignment = "center" vertAlignment = "center" translation="[960,980]">
-
+    <LayoutGroup horizAlignment="center" vertAlignment="center" translation="[960,980]">
+      <Rectangle id="captionBG" color="#323232BF" height="0" width="0" />
     </LayoutGroup>
+    <LayoutGroup id="captionGroup" horizAlignment="center" vertAlignment="center" translation="[960,980]"></LayoutGroup>
 
     <timer id="playbackTimer" repeat="true" duration="30" />
     <timer id="bufferCheckTimer" repeat="true" />
-    <JFButton id="nextEpisode" opacity="0" textColor="#f0f0f0" focusedTextColor="#202020" focusFootprintBitmapUri="pkg:/images/option-menu-bg.9.png" focusBitmapUri="pkg:/images/white.9.png" translation="[1500, 900]" />
+    <JFButton id="nextEpisode"
+              opacity="0"
+              textColor="#f0f0f0"
+              focusedTextColor="#202020"
+              focusFootprintBitmapUri="pkg:/images/option-menu-bg.9.png"
+              focusBitmapUri="pkg:/images/white.9.png"
+              translation="[1500, 900]" />
 
     <!--animation for the play next episode button-->
     <Animation id="showNextEpisodeButton" duration="1.0" repeat="false" easeFunction="inQuad">
diff --git a/components/captionTask.brs b/components/captionTask.brs
index 8dd45a85b..732046333 100644
--- a/components/captionTask.brs
+++ b/components/captionTask.brs
@@ -10,8 +10,9 @@ sub init()
     m.reader = createObject("roUrlTransfer")
 
     m.font = CreateObject("roSGNode", "Font")
-    m.font.uri = "pkg:/fonts/noto.otf"
+    m.font.uri = "pkg:/components/fonts/noto.otf"
     m.font.size = 50
+    ' m.font = "font:LargeSystemFont"
 end sub
 
 sub fetchCaption()
diff --git a/components/fonts/noto.otf b/components/fonts/noto.otf
new file mode 100644
index 000000000..7c5c2fae3
Binary files /dev/null and b/components/fonts/noto.otf differ
diff --git a/components/fonts/notoB.otf b/components/fonts/notoB.otf
new file mode 100644
index 000000000..be388bf5f
Binary files /dev/null and b/components/fonts/notoB.otf differ
diff --git a/source/utils/Subtitles.brs b/source/utils/Subtitles.brs
index dc1533301..ce8927c16 100644
--- a/source/utils/Subtitles.brs
+++ b/source/utils/Subtitles.brs
@@ -92,7 +92,6 @@ function setupSubtitle(video, subtitles, subtitle_idx = -1) as integer
     else
         ' If this is a text-based subtitle, set relevant settings for roku captions
         video.captionVisible = True
-
         video.subtitleTrack = video.availableSubtitleTracks[availSubtitleTrackIdx(video, subtitleSelIdx)].TrackName
     end if