diff --git a/1080i/DialogContextMenu.xml b/1080i/DialogContextMenu.xml
index a42a1b9..ee90597 100644
--- a/1080i/DialogContextMenu.xml
+++ b/1080i/DialogContextMenu.xml
@@ -4,36 +4,57 @@
     <include>fadeInOut</include>
     <controls>
         <include>modalDialog</include>
+		<control type="textbox">
+			<visible>integer.IsGreater(Container(996).NumItems,0)</visible>
+			<posx>336</posx>
+			<posy>5-row</posy>
+			<width>8-col</width>
+			<height>3-row</height>
+			<font>sectionTitle</font>
+			<textcolor>textActive</textcolor>
+			<label>[COLOR highlight]$LOCALIZE[31179][/COLOR] $INFO[listitem.title]</label>
+		</control>
 		<control type="grouplist" id="996">
-            <posx>col-6-begin</posx>
-            <posy>7-row</posy>
+            <posx>col-4-begin</posx>
+            <posy>8-row</posy>
             <itemgap>0</itemgap>
 			<onright>9004</onright>
-			<height>17-row</height>
+			<height>16-row</height>
         </control>
-		<control type="grouplist" id="9004">
+		<control type="group">
 			<animation type="Conditional" condition="!integer.IsGreater(Container(996).NumItems,0)">
-	            <effect type="slide" end="-300" time="0"/>
+	            <effect type="slide" end="-434" time="0"/>
 	        </animation>
-			<posx>col-14-begin</posx>
-            <posy>7-row</posy>
-            <itemgap>0</itemgap>
-            <width>6-col</width>
-            <height>17-row</height>
-            <itemgap>0</itemgap>
-			<onleft>996</onleft>
-            <include condition="Window.isactive(Videos) | window.isactive(videoplaylist) | window.isactive(tvchannels) | window.isactive(tvguide) | window.isactive(TVRecordings) | window.isactive(tvtimers)">videoSideMenu</include>
-            <include condition="Window.isactive(Music) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicSideMenu</include>
-            <include condition="window.isactive(pictures)">picturesSideMenu</include>
-            <include condition="window.isactive(addonbrowser)">addonsSideMenu</include>
-			<include condition="window.isactive(games)">gameSideMenu</include>
-        </control>
-        <control type="button" id="1000">
-            <description>Buttons</description>
-            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
-            <focusedcolor>textActive</focusedcolor>
-            <width>6-col</width>
-        </control>
+			<control type="textbox">
+				<posx>1200</posx>
+				<posy>5-row</posy>
+				<width>8-col</width>
+				<height>3-row</height>
+				<font>sectionTitle</font>
+				<textcolor>textActive</textcolor>
+				<label>[COLOR highlight]$LOCALIZE[31179][/COLOR] $LOCALIZE[31243]</label>
+			</control>
+			<control type="grouplist" id="9004">
+				<posx>col-16-begin</posx>
+	            <posy>8-row</posy>
+	            <itemgap>0</itemgap>
+	            <width>6-col</width>
+	            <height>16-row</height>
+	            <itemgap>0</itemgap>
+				<onleft>996</onleft>
+	            <include condition="Window.isactive(Videos) | window.isactive(videoplaylist) | window.isactive(tvchannels) | window.isactive(tvguide) | window.isactive(TVRecordings) | window.isactive(tvtimers)">videoSideMenu</include>
+	            <include condition="Window.isactive(Music) | window.isactive(musicplaylist) | window.isactive(radiochannels)">musicSideMenu</include>
+	            <include condition="window.isactive(pictures)">picturesSideMenu</include>
+	            <include condition="window.isactive(addonbrowser)">addonsSideMenu</include>
+				<include condition="window.isactive(games)">gameSideMenu</include>
+	        </control>
+	        <control type="button" id="1000">
+	            <description>Buttons</description>
+	            <texturefocus colordiffuse="highlight">colors/white.png</texturefocus>
+	            <focusedcolor>textActive</focusedcolor>
+	            <width>6-col</width>
+	        </control>
+		</control>
         <!--debugging-->
         <include>DebugGrid</include>
         <control type="label">
diff --git a/1080i/VideoOSD.xml b/1080i/VideoOSD.xml
index c76a800..1deae9e 100644
--- a/1080i/VideoOSD.xml
+++ b/1080i/VideoOSD.xml
@@ -72,18 +72,37 @@
 	                    <label>$INFO[videoplayer.title]</label>
 	                </control>
 				</control>
-                <!--player position-->   
-                <control type="label">
-                    <posx>0</posx>
+                <!--player position--> 
+  				<control type="group">
+					<posx>0</posx>
                     <posy>5-row</posy>
-                    <width>8-col</width>
-                    <height>3-row</height>
-                    <font>pageSubTitle</font>
-                    <aligny>center</aligny>
-                    <textcolor>textActive</textcolor>
-                    <label>[B]$INFO[Player.FinishTime(HH:MM),$LOCALIZE[31160] ,]$INFO[player.timeremaining, - , $LOCALIZE[31143]][/B]</label>
-                    <scroll>false</scroll>
-                </control>
+					<visible>!Pvr.IsPlayingTv</visible>
+                	<control type="label">
+	                    <posx>0</posx>
+	                    <posy>0</posy>
+	                    <width>8-col</width>
+	                    <height>3-row</height>
+	                    <font>buttonTitle</font>
+	                    <aligny>center</aligny>
+	                    <textcolor>textActive</textcolor>
+	                    <label>[B]$INFO[player.timeremaining]    $INFO[player.finishtime,$LOCALIZE[31160] ,][/B]</label>
+	                    <scroll>false</scroll>
+	                </control>
+				</control>
+				<control type="group">
+					<visible>Pvr.IsPlayingTv</visible>
+					<control type="label">
+	                    <posx>0</posx>
+	                    <posy>5-row</posy>
+	                    <width>600</width>
+	                    <height>3-row</height>
+	                    <font>pageSubTitle</font>
+	                    <aligny>center</aligny>
+	                    <textcolor>textActive</textcolor>
+	                    <label>[B]$INFO[VideoPlayer.EndTime,$LOCALIZE[31160] ,] • $INFO[VideoPlayer.NextTitle,$LOCALIZE[31242]: ,][/B]</label>
+	                    <scroll>false</scroll>
+	                </control>
+				</control>
                 <!--synopsis-->
                 <control type="textbox">
                     <posx>0</posx>
diff --git a/addon.xml b/addon.xml
index df8bfdd..6c82216 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<addon id="skin.pellucid" version="2.0.0" name="Pellucid" provider-name="theDeadman">
+<addon id="skin.pellucid" version="2.0.1" name="Pellucid" provider-name="theDeadman">
     <requires>
         <import addon="xbmc.gui" version="5.13.0"/>
         <import addon="script.skinshortcuts" version="1.0.13"/>
diff --git a/changelog.txt b/changelog.txt
index 1b85588..ab22864 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,11 +1,10 @@
+*In pipeline*
+- revise controls for new window: MyGames.xml
+
 **Changelog**
 [V2.0.0] ***LEIA RELEASE***
 
-*In pipeline*
-- [GO TO ALBUM / ARTIST] Update script.
-- revise controls for new window: MyGames.xml
-- Rework context menu (activate via second menu)
-
+- [COMPLETE] Minor bugfixes
 
 [V1.4.0] ***LEIA BUILDS ONLY***
 - Preparing for Leia compatibility
diff --git a/language/English/strings.po b/language/English/strings.po
index 66ff375..77e760b 100644
--- a/language/English/strings.po
+++ b/language/English/strings.po
@@ -992,3 +992,11 @@ msgstr ""
 msgctxt "#31241"
 msgid "Shuffle"
 msgstr ""
+
+msgctxt "#31242"
+msgid "Next"
+msgstr ""
+
+msgctxt "#31243"
+msgid "General"
+msgstr ""
\ No newline at end of file