diff --git a/components/LibList.xml b/components/LibList.xml
index 7b55aea7..a3178c46 100644
--- a/components/LibList.xml
+++ b/components/LibList.xml
@@ -27,7 +27,7 @@
     dimensions = m.top.getScene().currentDesignResolution
 
     border = 200
-    m.top.translation = [border, border]
+    m.top.translation = [border, border + 115]
 
     itemWidth = (dimensions["width"] - border*2) / m.top.rowSize
     itemHeight = 75
@@ -82,6 +82,7 @@
         item.labelText = datum.name
         item.libraryID = datum.id
         item.libraryType = datum.CollectionType
+        item.data = datum
       end for
     end for
     return data
diff --git a/components/Library.xml b/components/Library.xml
index b70f2b04..b7fa4dd6 100644
--- a/components/Library.xml
+++ b/components/Library.xml
@@ -2,5 +2,6 @@
 <component name="Library" extends="Scene">
   <children>
     <LibraryRow id="LibrarySelect" />
+    <Overhang id="overhang" title="Libraries" />
   </children>
 </component>
diff --git a/components/LibraryData.xml b/components/LibraryData.xml
index b6c0490f..dcf7e3be 100644
--- a/components/LibraryData.xml
+++ b/components/LibraryData.xml
@@ -4,5 +4,6 @@
     <field id="labelText" type="string" />
     <field id="libraryID" type="string" />
     <field id="libraryType" type="string" />
+    <field id="data" type="associativearray" />
   </interface>
 </component>
diff --git a/components/MovieList.xml b/components/MovieList.xml
index 9b80b7b9..7190bec8 100644
--- a/components/MovieList.xml
+++ b/components/MovieList.xml
@@ -3,6 +3,7 @@
   <interface>
     <field id="rowSize" type="int" />
     <field id="movieData" type="associativearray" onChange="setData" />
+    <field id="library" type="associativearray" />
   </interface>
   <script type="text/brightscript">
   <![CDATA[
@@ -10,7 +11,6 @@
     m.top.itemComponentName = "ListPoster"
     m.top.content = getData()
 
-
     m.top.rowFocusAnimationStyle = "floatingFocus"
     'm.top.vertFocusAnimationStyle = "floatingFocus"
 
@@ -28,7 +28,7 @@
     dimensions = m.top.getScene().currentDesignResolution
 
     border = 75
-    m.top.translation = [border, border]
+    m.top.translation = [border, border + 115]
 
     textHeight = 50
     ' Do we decide width by rowSize, or rowSize by width...
diff --git a/components/Movies.xml b/components/Movies.xml
index 59e97c22..32658502 100644
--- a/components/Movies.xml
+++ b/components/Movies.xml
@@ -6,5 +6,9 @@
       id="MovieSelect"
       visible="true"
       />
+    <Overhang
+      id="overhang"
+      title="Movies"
+      />
   </children>
 </component>
diff --git a/components/TVShows.xml b/components/TVShows.xml
index 4eb1f328..e91537f3 100644
--- a/components/TVShows.xml
+++ b/components/TVShows.xml
@@ -5,5 +5,9 @@
       id="TVShowSelect"
       visible="true"
       />
+    <Overhang
+      id="overhang"
+      title="TV Shows"
+      />
   </children>
 </component>
diff --git a/source/ShowScenes.brs b/source/ShowScenes.brs
index 34bd032c..69b316d9 100644
--- a/source/ShowScenes.brs
+++ b/source/ShowScenes.brs
@@ -100,9 +100,9 @@ sub ShowLibrarySelect()
     else if nodeEventQ(msg, "itemSelected")
       target = getMsgRowTarget(msg)
       if target.libraryType = "movies"
-        ShowMovieOptions(target.libraryID)
+        ShowMovieOptions(target.data)
       else if target.libraryType = "tvshows"
-        ShowTVShowOptions(target.libraryID)
+        ShowTVShowOptions(target.data)
       else
         print Substitute("Library type {0} is not yet implemented", target.libraryType)
       end if
@@ -110,7 +110,8 @@ sub ShowLibrarySelect()
   end while
 end sub
 
-sub ShowMovieOptions(library_id)
+sub ShowMovieOptions(library)
+  library_id = library.id
   port = CreateObject("roMessagePort")
   screen = CreateObject("roSGScreen")
   screen.setMessagePort(port)
@@ -118,9 +119,13 @@ sub ShowMovieOptions(library_id)
 
   screen.show()
 
+  overhang = scene.findNode("overhang")
+  overhang.title = library.name
+
   themeScene(scene)
 
   options = scene.findNode("MovieSelect")
+  options.library = library
   page_size = 30
   page_num = 1
   options_list = ItemList(library_id, {"limit": page_size,
@@ -199,7 +204,8 @@ sub ShowMovieDetails(movie_id)
   end while
 end sub
 
-sub ShowTVShowOptions(library_id)
+sub ShowTVShowOptions(library)
+  library_id = library.ID
   port = CreateObject("roMessagePort")
   screen = CreateObject("roSGScreen")
   screen.setMessagePort(port)
@@ -207,6 +213,9 @@ sub ShowTVShowOptions(library_id)
 
   screen.show()
 
+  overhang = scene.findNode("overhang")
+  overhang.title = library.name
+
   themeScene(scene)
 
   options = scene.findNode("TVShowSelect")