diff --git a/components/tvshows/details.xml b/components/tvshows/details.xml
index 51c25d60..87a1066a 100644
--- a/components/tvshows/details.xml
+++ b/components/tvshows/details.xml
@@ -11,8 +11,8 @@
     </PanelSet>
   </children>
   <interface>
-    <field id="itemData" type="node" onChange="dataChanged" />
-    <field id="seasonData" type="associativearray" onChange="seasonChanged" />
+    <field id="itemData" type="node" alias="description.itemContent" />
+    <field id="seasonData" type="associativearray" alias="seasons.TVSeasonData" />
     <field id="panelFocused"
       alias="panelset.leftPanelIndex"
       type="integer"
@@ -34,14 +34,8 @@
       panel2.panelSize = "full"
       panel2.hasNextPanel = false
       panel2.isFullScreen = true
-    end sub
-
-    sub dataChanged()
-      m.top.findNode("description").itemContent = m.top.itemData
-    end sub
-
-    sub seasonChanged()
-      m.top.findNode("seasons").TVSeasonData = m.top.seasonData
+      panel2.leftPosition = 150
+      ' TODO - set the bounds so seasons dont go off the edge of the screen
     end sub
 
     sub panelFocusChanged()
diff --git a/source/ShowScenes.brs b/source/ShowScenes.brs
index 8e2c0048..51164ac9 100644
--- a/source/ShowScenes.brs
+++ b/source/ShowScenes.brs
@@ -382,9 +382,10 @@ sub ShowTVShowDetails(show_id)
   themeScene(scene)
 
   scene.itemData = ItemMetaData(show_id)
+  scene.findNode("description").findNode("buttons").setFocus(true)
   scene.seasonData = TVSeasons(show_id)
 
-  scene.findNode("panel-desc").findNode("buttons").setFocus(true)
+  scene.findNode("description").findNode("buttons").setFocus(true)
 
   'buttons = scene.findNode("buttons")
   'buttons.observeField("buttonSelected", port)