diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 00000000..4cfc3dd2
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,5 @@
+{
+    "files.associations": {
+        "*.ts": "xml"
+    }
+}
\ No newline at end of file
diff --git a/components/ItemGrid/ItemGrid.brs b/components/ItemGrid/ItemGrid.brs
index 5934cddd..4aaf1fd6 100644
--- a/components/ItemGrid/ItemGrid.brs
+++ b/components/ItemGrid/ItemGrid.brs
@@ -94,19 +94,21 @@ sub loadInitialItems()
     else
         m.sortAscending = false
     end if
-    'Set Stuido Id
+    ' Set Studio Id
     if m.top.parentItem.json.type = "Studio"
-        m.loadItemsTask.studioIds = m.top.parentItem.Id
+        m.loadItemsTask.studioIds = m.top.parentItem.id
         m.loadItemsTask.itemId = m.top.parentItem.parentFolder
         m.loadItemsTask.genreIds = ""
-        'set Genre Id
+        ' Set Genre Id
     else if m.top.parentItem.json.type = "Genre"
-        m.loadItemsTask.genreIds = m.top.parentItem.Id
+        m.loadItemsTask.genreIds = m.top.parentItem.id
         m.loadItemsTask.itemId = m.top.parentItem.parentFolder
         m.loadItemsTask.studioIds = ""
     else if (m.view = "Shows" or m.options.view = "Shows") or (m.view = "Movies" or m.options.view = "Movies")
         m.loadItemsTask.studioIds = ""
         m.loadItemsTask.genreIds = ""
+    else
+        m.loadItemsTask.itemId = m.top.parentItem.Id
     end if
     updateTitle()
 
@@ -116,7 +118,7 @@ sub loadInitialItems()
     m.loadItemsTask.sortAscending = m.sortAscending
     m.loadItemsTask.filter = m.filter
     m.loadItemsTask.startIndex = 0
-    'Load Item Types
+    ' Load Item Types
     if m.top.parentItem.collectionType = "movies"
         m.loadItemsTask.itemType = "Movie"
         m.loadItemsTask.itemId = m.top.parentItem.Id
@@ -143,19 +145,15 @@ sub loadInitialItems()
     else if m.top.parentItem.collectionType = "livetv"
         m.loadItemsTask.itemType = "LiveTV"
 
-        'For LiveTV, we want to "Fit" the item images, not zoom
+        ' For LiveTV, we want to "Fit" the item images, not zoom
         m.top.imageDisplayMode = "scaleToFit"
 
         if get_user_setting("display.livetv.landing") = "guide" and m.options.view <> "livetv"
             showTvGuide()
         end if
-
-
     else if m.top.parentItem.collectionType = "CollectionFolder" or m.top.parentItem.type = "CollectionFolder" or m.top.parentItem.collectionType = "boxsets" or m.top.parentItem.Type = "Boxset" or m.top.parentItem.Type = "Folder" or m.top.parentItem.Type = "Channel"
-
         ' Non-recursive, to not show subfolder contents
         m.loadItemsTask.recursive = false
-        m.loadItemsTask.itemId = m.top.parentItem.parentFolder
     else if m.top.parentItem.Type = "Channel"
         m.top.imageDisplayMode = "scaleToFit"
     else if m.top.parentItem.json.type = "Studio"
@@ -168,7 +166,7 @@ sub loadInitialItems()
     else
         print "[ItemGrid] Unknown Type: " m.top.parentItem
     end if
-    'end if
+
     if m.top.parentItem.type <> "Folder" and (m.options.view = "Networks" or m.view = "Networks" or m.options.view = "Studios" or m.view = "Studios")
         m.loadItemsTask.view = "Networks"
         m.top.imageDisplayMode = "scaleToFit"
diff --git a/components/ItemGrid/ItemGrid.xml b/components/ItemGrid/ItemGrid.xml
index 99a2dd19..40a620a6 100644
--- a/components/ItemGrid/ItemGrid.xml
+++ b/components/ItemGrid/ItemGrid.xml
@@ -3,13 +3,13 @@
   <children>
   
     <poster id="backdrop" 
-      loadDisplayMode="scaleToFit"
+      loadDisplayMode="scaleToFill"
       width="1920"
       height="1080" 
       opacity="0.25"
       />
     <poster id="backdropTransition" 
-      loadDisplayMode="scaleToFit"
+      loadDisplayMode="scaleToFill"
       width="1920"
       height="1080" 
       opacity="0.25"
diff --git a/components/data/HomeData.brs b/components/data/HomeData.brs
index de82c422..757740cf 100644
--- a/components/data/HomeData.brs
+++ b/components/data/HomeData.brs
@@ -37,7 +37,7 @@ sub setData()
         imgParams.Append({ "maxHeight": 261 })
         imgParams.Append({ "maxWidth": 464 })
 
-        m.top.thumbnailURL = ImageURL(datum.Id, "Primary", imgParams)
+        m.top.thumbnailURL = ImageURL(datum.id, "Primary", imgParams)
 
         ' Add Wide Poster  (Series Backdrop)
         if datum.ParentThumbImageTag <> invalid
@@ -45,7 +45,7 @@ sub setData()
         else if datum.ParentBackdropImageTags <> invalid
             m.top.widePosterUrl = ImageURL(datum.ParentBackdropItemId, "Backdrop", imgParams)
         else if datum.ImageTags.Primary <> invalid
-            m.top.posterUrl = ImageURL(datum.SeriesId, "Primary", imgParams)
+            m.top.widePosterUrl = ImageURL(datum.id, "Primary", imgParams)
         end if
 
     else if datum.type = "Series"
@@ -82,7 +82,7 @@ sub setData()
 
         if datum.ImageTags <> invalid and datum.imageTags.Thumb <> invalid
             m.top.thumbnailUrl = ImageURL(datum.Id, "Thumb", imgParams)
-        else if datum.BackdropImageTags <> invalid and datum.BackdropImageTags[0] <> invalid
+        else if datum.BackdropImageTags[0] <> invalid
             m.top.thumbnailUrl = ImageURL(datum.id, "Backdrop", imgParams)
         end if
 
@@ -106,7 +106,7 @@ sub setData()
         else if datum.BackdropImageTags[0] <> invalid
             m.top.thumbnailUrl = ImageURL(datum.id, "Backdrop", imgParams)
         end if
-    else if datum.type = "MusicAlbum" or datum.type = "Audio" or datum.type = "Book"
+    else if datum.type = "MusicAlbum"
         params = { "maxHeight": 261, "maxWidth": 261 }
         m.top.thumbnailURL = ImageURL(datum.id, "Primary", params)
         m.top.widePosterUrl = m.top.thumbnailURL
diff --git a/components/data/HomeData.xml b/components/data/HomeData.xml
index 94787d8e..221ed9ff 100644
--- a/components/data/HomeData.xml
+++ b/components/data/HomeData.xml
@@ -12,8 +12,6 @@
     <field id="collectionType" type="string" />
     <field id="imageWidth" type="integer" value="464" />
     <field id="usePoster" type="bool" value="false" />
-    <field id="stretch" type="bool" value="false" />
-    <field id="isSmall" type="bool" value="false" />
   </interface>
   <script type="text/brightscript" uri="pkg:/source/api/baserequest.brs" />
   <script type="text/brightscript" uri="pkg:/source/utils/config.brs" />
diff --git a/components/home/Home.brs b/components/home/Home.brs
index bc951c1a..af864c6d 100644
--- a/components/home/Home.brs
+++ b/components/home/Home.brs
@@ -9,7 +9,7 @@ sub init()
 end sub
 
 sub refresh()
-    m.top.findNode("homeRows").callFunc("loadLibraries")
+    m.top.findNode("homeRows").callFunc("updateHomeRows")
 end sub
 
 sub loadLibraries()
diff --git a/components/home/HomeItem.brs b/components/home/HomeItem.brs
index fa8b186e..057a8d00 100644
--- a/components/home/HomeItem.brs
+++ b/components/home/HomeItem.brs
@@ -18,6 +18,8 @@ sub itemContentChanged()
     itemData = m.top.itemContent
     if itemData = invalid then return
     itemData.Title = itemData.name ' Temporarily required while we move from "HomeItem" to "JFContentItem"
+
+
     m.itemPoster.width = itemData.imageWidth
     m.itemText.maxWidth = itemData.imageWidth
     m.itemTextExtra.width = itemData.imageWidth
@@ -30,32 +32,18 @@ sub itemContentChanged()
         m.itemIcon.uri = itemData.iconUrl
     end if
 
-    if itemData.stretch = true
-        m.itemPoster.loadDisplayMode = "scaleToZoom"
-    end if
-
     ' Format the Data based on the type of Home Data
     if itemData.type = "CollectionFolder" or itemData.type = "UserView" or itemData.type = "Channel"
         m.itemText.text = itemData.name
-        if itemData.isSmall = true
-            m.backdrop.height = "100"
-            m.itemText.translation = [0, 20]
-            itemData.usePoster = false
-        end if
-        if itemData.usePoster = true
-            m.itemPoster.uri = itemData.widePosterURL
-        end if
+        m.itemPoster.uri = itemData.widePosterURL
         return
     end if
 
-    if itemData.type = "UserView" and itemData.usePoster = true
+    if itemData.type = "UserView"
         m.itemPoster.width = "96"
         m.itemPoster.height = "96"
         m.itemPoster.translation = "[192, 88]"
         m.itemText.text = itemData.name
-        if itemData.isSmall = true
-            m.itemText.translation = [8, 10]
-        end if
         m.itemPoster.uri = itemData.widePosterURL
         return
     end if
@@ -64,7 +52,8 @@ sub itemContentChanged()
     m.itemText.height = 34
     m.itemText.font.size = 25
     m.itemText.horizAlign = "left"
-    ' m.itemText.vertAlign = "bottom"
+    m.itemText.vertAlign = "bottom"
+    m.itemTextExtra.visible = true
     m.itemTextExtra.font.size = 22
 
     ' "Program" is from clicking on an "On Now" item on the Home Screen
@@ -86,12 +75,9 @@ sub itemContentChanged()
         m.itemText.text = itemData.json.SeriesName
 
         if itemData.usePoster = true
-            m.itemPoster.uri = itemData.posterURL
-        else
             m.itemPoster.uri = itemData.widePosterURL
-        end if
-        if itemData.json.ImageURL <> invalid
-            m.itemPoster.uri = itemData.json.ImageURL
+        else
+            m.itemPoster.uri = itemData.thumbnailURL
         end if
 
         ' Set Series and Episode Number for Extra Text
@@ -119,9 +105,6 @@ sub itemContentChanged()
         else
             m.itemPoster.uri = itemData.thumbnailURL
         end if
-        if itemData.json.ImageURL <> invalid
-            m.itemPoster.uri = itemData.json.ImageURL
-        end if
 
         ' Set Release Year and Age Rating for Extra Text
         textExtra = ""
@@ -148,17 +131,22 @@ sub itemContentChanged()
         else
             m.itemPoster.uri = itemData.thumbnailURL
         end if
-        if itemData.json.ImageURL <> invalid
-            m.itemPoster.uri = itemData.json.ImageURL
-        end if
         return
     end if
     if itemData.type = "Series"
+
         m.itemText.text = itemData.name
-        m.itemPoster.uri = itemData.posterURL
-        if itemData.json.ImageURL <> invalid
-            m.itemPoster.uri = itemData.json.ImageURL
+
+        if itemData.usePoster = true
+            if itemData.imageWidth = 180
+                m.itemPoster.uri = itemData.posterURL
+            else
+                m.itemPoster.uri = itemData.widePosterURL
+            end if
+        else
+            m.itemPoster.uri = itemData.thumbnailURL
         end if
+
         textExtra = ""
         if itemData.json.ProductionYear <> invalid
             textExtra = StrI(itemData.json.ProductionYear).trim()
@@ -175,25 +163,10 @@ sub itemContentChanged()
         return
     end if
 
-    if itemData.type = "MusicAlbum" or itemData.type = "Audio" or itemData.type = "Book" or itemData.type = "AudioBook"
+    if itemData.type = "MusicAlbum"
         m.itemText.text = itemData.name
         m.itemTextExtra.text = itemData.json.AlbumArtist
-        if itemData.usePoster = true
-            if itemData.posterURL <> ""
-                m.itemPoster.uri = itemData.posterURL
-            else
-                m.itemPoster.uri = itemData.json.ImageURL
-            end if
-        end if
-        return
-    end if
-
-    if itemData.type = "Photo" or itemData.type = "PhotoAlbum"
-        if itemData.usePoster = true
-            if itemData.json.ImageURL <> invalid
-                m.itemPoster.uri = itemData.json.ImageURL
-            end if
-        end if
+        m.itemPoster.uri = itemData.posterURL
         return
     end if
 
@@ -215,13 +188,11 @@ end sub
 
 'Hide backdrop and icon when poster loaded
 sub onPosterLoadStatusChanged()
-    if m.itemPoster <> invalid
-        if m.itemPoster.loadStatus = "ready" and m.itemPoster.uri <> ""
-            m.backdrop.visible = false
-            m.itemIcon.visible = false
-        else
-            m.backdrop.visible = true
-            m.itemIcon.visible = true
-        end if
+    if m.itemPoster.loadStatus = "ready" and m.itemPoster.uri <> ""
+        m.backdrop.visible = false
+        m.itemIcon.visible = false
+    else
+        m.backdrop.visible = true
+        m.itemIcon.visible = true
     end if
 end sub
diff --git a/components/home/HomeItem.xml b/components/home/HomeItem.xml
index f12d5af7..4fce477a 100644
--- a/components/home/HomeItem.xml
+++ b/components/home/HomeItem.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <component name="HomeItem" extends="Group">
   <children>
-    <Rectangle id="backdrop" width="464" height="270" translation="[8,0]" />
+    <Rectangle id="backdrop" width="464" height="261" translation="[8,5]" />
     <Poster id="itemIcon" width="100" height="100" translation="[190,85]" loadDisplayMode="scaleToFit" />
-    <Poster id="itemPoster" width="464" height="270" translation="[0,0]" loadDisplayMode="scaleToZoom" />
-    <ScrollingLabel id="itemText" horizAlign="center" vertAlign="center" font="font:SmallBoldSystemFont" height="64" maxWidth="456" translation="[8,280]" repeatCount="0" />
-    <Label id="itemTextExtra" horizAlign="left" vertAlign="center" font="font:SmallBoldSystemFont" height="32" width="456" translation="[8,319]" visible="true" color="#777777FF" />
+    <Poster id="itemPoster" width="464" height="261" translation="[8,5]" loadDisplayMode="scaleToZoom" />
+    <ScrollingLabel id="itemText" horizAlign="center" vertAlign="center" font="font:SmallBoldSystemFont" height="64" maxWidth="456" translation="[8,267]" repeatCount="0" />
+    <Label id="itemTextExtra" horizAlign="left" vertAlign="center" font="font:SmallBoldSystemFont" height="32" width="456" translation="[8,300]" visible="false" color="#777777FF" />
   </children>
   <interface>
     <field id="itemContent" type="node" onChange="itemContentChanged" />
diff --git a/components/home/HomeRow.xml b/components/home/HomeRow.xml
index dc59d1fc..9722a34b 100644
--- a/components/home/HomeRow.xml
+++ b/components/home/HomeRow.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <component name="HomeRow" extends="ContentNode">
   <interface>
-    <field id="imageWidth" type="integer" value="200" />
-    <field id="stretch" type="bool" value="false" />
+    <field id="imageWidth" type="integer" value="464" />
     <field id="usePoster" type="bool" value="false" />
   </interface>
 </component>
diff --git a/components/home/HomeRows.brs b/components/home/HomeRows.brs
index d3e10e6e..b9b852de 100644
--- a/components/home/HomeRows.brs
+++ b/components/home/HomeRows.brs
@@ -10,12 +10,6 @@ sub init()
     m.top.rowLabelOffset = [0, 20]
     m.top.showRowCounter = [true]
 
-    m.latestMediaCount = 0
-    m.latestMediaInt = 0
-    m.latestMediaNode = ""
-    m.sectionCount = 0
-    m.sectionIgnores = []
-
     updateSize()
 
     m.top.setfocus(true)
@@ -25,20 +19,9 @@ sub init()
     ' Load the Libraries from API via task
     m.LoadLibrariesTask = createObject("roSGNode", "LoadItemsTask")
     m.LoadLibrariesTask.observeField("content", "onLibrariesLoaded")
-
-    m.LoadHomeSectionTask = createObject("roSGNode", "LoadItemsTask")
-
-    m.LoadMyMediaTask = createObject("roSGNode", "LoadItemsTask")
-    m.LoadMyMediaTask.itemsToLoad = "libraries"
-    m.LoadMyMediaSmallTask = createObject("roSGNode", "LoadItemsTask")
-    m.LoadMyMediaSmallTask.itemsToLoad = "libraries"
-    m.LoadLatestMediaTask = createObject("roSGNode", "LoadItemsTask")
-    m.LoadContinueVideoTask = createObject("roSGNode", "LoadItemsTask")
-    m.LoadContinueVideoTask.itemsToLoad = "continueVideo"
-    m.LoadContinueAudioTask = createObject("roSGNode", "LoadItemsTask")
-    m.LoadContinueAudioTask.itemsToLoad = "continueAudio"
-    m.LoadContinueBookTask = createObject("roSGNode", "LoadItemsTask")
-    m.LoadContinueBookTask.itemsToLoad = "continueBook"
+    ' set up tesk nodes for other rows
+    m.LoadContinueTask = createObject("roSGNode", "LoadItemsTask")
+    m.LoadContinueTask.itemsToLoad = "continue"
     m.LoadNextUpTask = createObject("roSGNode", "LoadItemsTask")
     m.LoadNextUpTask.itemsToLoad = "nextUp"
     m.LoadOnNowTask = createObject("roSGNode", "LoadItemsTask")
@@ -51,13 +34,13 @@ end sub
 
 sub updateSize()
     m.top.translation = [111, 180]
-    itemHeight = 380
+    itemHeight = 330
 
     'Set width of Rows to cut off at edge of Safe Zone
     m.top.itemSize = [1703, itemHeight]
 
     ' spacing between rows
-    m.top.itemSpacing = [0, 55]
+    m.top.itemSpacing = [0, 105]
 
     ' spacing between items in a row
     m.top.rowItemSpacing = [20, 0]
@@ -66,699 +49,177 @@ sub updateSize()
 end sub
 
 sub onLibrariesLoaded()
-    m.LoadHomeSectionTask.observeField("content", "loadHomeSections")
-    m.LoadHomeSectionTask.control = "RUN"
-end sub
-
-sub loadHomeSections()
+    ' save data for other functions
     m.libraryData = m.LoadLibrariesTask.content
     m.LoadLibrariesTask.unobserveField("content")
+    m.LoadLibrariesTask.content = []
+    ' create My Media, Continue Watching, and Next Up rows
     content = CreateObject("roSGNode", "ContentNode")
+    mediaRow = content.CreateChild("HomeRow")
+    mediaRow.title = tr("My Media")
+    continueRow = content.CreateChild("HomeRow")
+    continueRow.title = tr("Continue Watching")
+    nextUpRow = content.CreateChild("HomeRow")
+    nextUpRow.title = tr("Next Up >")
+    sizeArray = [
+        [464, 311], ' My Media
+        [464, 331], ' Continue Watching
+        [464, 331] ' Next Up
+    ]
+    haveLiveTV = false
+    ' validate library data
+    if m.libraryData <> invalid and m.libraryData.count() > 0
+        userConfig = m.top.userConfig
+        ' populate My Media row
+        filteredMedia = filterNodeArray(m.libraryData, "id", userConfig.MyMediaExcludes)
+        for each item in filteredMedia
+            mediaRow.appendChild(item)
+        end for
+        ' create a "Latest In" row for each library
+        filteredLatest = filterNodeArray(m.libraryData, "id", userConfig.LatestItemsExcludes)
+        for each lib in filteredLatest
+            if lib.collectionType <> "boxsets" and lib.collectionType <> "livetv"
+                latestInRow = content.CreateChild("HomeRow")
+                latestInRow.title = tr("Latest in") + " " + lib.name + " >"
+                sizeArray.Push([464, 331])
+            else if lib.collectionType = "livetv"
+                ' If we have Live TV, add "On Now"
+                onNowRow = content.CreateChild("HomeRow")
+                onNowRow.title = tr("On Now")
+                sizeArray.Push([464, 331])
+                haveLiveTV = true
+            end if
+        end for
+    end if
+
+    m.top.rowItemSize = sizeArray
     m.top.content = content
 
-    setLatestMediaCount()
-    createHoldingChildren()
+    ' Load the Continue Watching Data
+    m.LoadContinueTask.observeField("content", "updateContinueItems")
+    m.LoadContinueTask.control = "RUN"
 
-    m.latestMediaInt = getHomeSectionInt("latestmedia")
-    m.sectionCount = getHomeSectionCount()
+    ' If we have Live TV access, load "On Now" data
+    if haveLiveTV
+        m.LoadOnNowTask.observeField("content", "updateOnNowItems")
+        m.LoadOnNowTask.control = "RUN"
+    end if
+end sub
 
-    for i = 0 to 6
-        content = m.top.content
-        homesection = get_user_setting(Substitute("display.homesection{0}", i.toStr()))
+sub updateHomeRows()
+    m.LoadContinueTask.observeField("content", "updateContinueItems")
+    m.LoadContinueTask.control = "RUN"
+end sub
 
-        if homesection = "smalllibrarytiles"
-            m.LoadMyMediaTask.observeField("content", "updateMyMedia")
-            m.LoadMyMediaTask.control = "RUN"
-            m.LoadMyMediaTask.observeField("state", "onUpdateMyMediaComplete")
-        else if homesection = "librarybuttons"
-            m.LoadMyMediaSmallTask.observeField("content", "updateMyMediaSmall")
-            m.LoadMyMediaSmallTask.control = "RUN"
-            m.LoadMyMediaSmallTask.observeField("state", "onUpdateMyMediaSmallComplete")
-        else if homesection = "latestmedia"
-            m.LoadLatestMediaTask.observeField("content", "updateLatestMedia")
-            m.LoadLatestMediaTask.control = "RUN"
-            m.LoadLatestMediaTask.observeField("state", "onUpdateLatestMediaComplete")
-        else if homesection = "resume"
-            m.LoadContinueVideoTask.observeField("content", "updateContinueVideoItems")
-            m.LoadContinueVideoTask.control = "RUN"
-            m.LoadContinueVideoTask.observeField("state", "onUpdateContinueVideoItemsComplete")
-        else if homesection = "resumeaudio"
-            m.LoadContinueAudioTask.observeField("content", "updateContinueAudioItems")
-            m.LoadContinueAudioTask.control = "RUN"
-            m.LoadContinueAudioTask.observeField("state", "onUpdateContinueAudioItemsComplete")
-        else if homesection = "resumebook"
-            m.LoadContinueBookTask.observeField("content", "updateContinueBookItems")
-            m.LoadContinueBookTask.control = "RUN"
-            m.LoadContinueBookTask.observeField("state", "onUpdateContinueBookItemsComplete")
-        else if homesection = "nextup"
-            m.LoadNextUpTask.observeField("content", "updateNextUpItems")
-            m.LoadNextUpTask.control = "RUN"
-            m.LoadNextUpTask.observeField("state", "onUpdateNextUpItemsComplete")
-        else if homesection = "livetv"
-            m.LoadOnNowTask.observeField("content", "updateOnNowItems")
-            m.LoadOnNowTask.control = "RUN"
-            m.LoadOnNowTask.observeField("state", "onUpdateOnNowItemsComplete")
-        else if homesection = "none"
-            child = i + 1
-            latest_media_int = m.latestMediaInt
-            latestMediaCount = m.latestMediaCount - 1
-            if latest_media_int < i + 1 and latestMediaCount > 0
-                child = child + latestMediaCount
-            end if
-            removeHoldingChild(child)
+sub updateContinueItems()
+    itemData = m.LoadContinueTask.content
+    m.LoadContinueTask.unobserveField("content")
+    m.LoadContinueTask.content = []
+
+    if itemData = invalid then return
+
+    homeRows = m.top.content
+    continueRowIndex = getRowIndex("Continue Watching")
+
+    if itemData.count() < 1
+        if continueRowIndex <> invalid
+            ' remove the row
+            deleteFromSizeArray(continueRowIndex)
+            homeRows.removeChildIndex(continueRowIndex)
         end if
-        m.top.content = content
-    end for
+    else
+        ' remake row using the new data
+        row = CreateObject("roSGNode", "HomeRow")
+        row.title = tr("Continue Watching")
+        itemSize = [464, 331]
+        for each item in itemData
+            item.usePoster = row.usePoster
+            item.imageWidth = row.imageWidth
+            row.appendChild(item)
+        end for
+
+        if continueRowIndex = invalid
+            ' insert new row under "My Media"
+            updateSizeArray(itemSize, 1)
+            homeRows.insertChild(row, 1)
+        else
+            ' replace the old row
+            homeRows.replaceChild(row, continueRowIndex)
+        end if
+    end if
+
+    m.LoadNextUpTask.observeField("content", "updateNextUpItems")
+    m.LoadNextUpTask.control = "RUN"
+end sub
+
+sub updateNextUpItems()
+    itemData = m.LoadNextUpTask.content
+    m.LoadNextUpTask.unobserveField("content")
+    m.LoadNextUpTask.content = []
+
+    if itemData = invalid then return
+
+    homeRows = m.top.content
+    nextUpRowIndex = getRowIndex("Next Up >")
+
+    if itemData.count() < 1
+        if nextUpRowIndex <> invalid
+            ' remove the row
+            deleteFromSizeArray(nextUpRowIndex)
+            homeRows.removeChildIndex(nextUpRowIndex)
+        end if
+    else
+        ' remake row using the new data
+        row = CreateObject("roSGNode", "HomeRow")
+        row.title = tr("Next Up") + " >"
+        itemSize = [464, 331]
+        for each item in itemData
+            item.usePoster = row.usePoster
+            item.imageWidth = row.imageWidth
+            row.appendChild(item)
+        end for
+
+        if nextUpRowIndex = invalid
+            ' insert new row under "Continue Watching"
+            continueRowIndex = getRowIndex("Continue Watching")
+            if continueRowIndex <> invalid
+                updateSizeArray(itemSize, continueRowIndex + 1)
+                homeRows.insertChild(row, continueRowIndex + 1)
+            else
+                ' insert it under My Media
+                updateSizeArray(itemSize, 1)
+                homeRows.insertChild(row, 1)
+            end if
+        else
+            ' replace the old row
+            homeRows.replaceChild(row, nextUpRowIndex)
+        end if
+    end if
 
     ' consider home screen loaded when above rows are loaded
     if m.global.app_loaded = false
         m.top.signalBeacon("AppLaunchComplete") ' Roku Performance monitoring
         m.global.app_loaded = true
     end if
-end sub
 
-sub setLatestMediaCount()
+
+    ' create task nodes for "Latest In" rows
     userConfig = m.top.userConfig
     filteredLatest = filterNodeArray(m.libraryData, "id", userConfig.LatestItemsExcludes)
-    latest_count = 0
+    for each lib in filteredLatest
+        if lib.collectionType <> "livetv" and lib.collectionType <> "boxsets" and lib.json.CollectionType <> "Program"
+            loadLatest = createObject("roSGNode", "LoadItemsTask")
+            loadLatest.itemsToLoad = "latest"
+            loadLatest.itemId = lib.id
 
-    ' Have to filter the orderedViews because Brightscript is awesome
-    userConfig = ParseJson(get_user_setting("display.userConfig"))
-    orderedViews = userConfig.Configuration.OrderedViews
-    filteredOrderedViews = []
-    if userConfig <> invalid
-        if orderedViews <> invalid
-            for i = 0 to orderedViews.count() - 1
-                for j = 0 to filteredLatest.count() - 1
-                    if filteredLatest[j].id = orderedViews[i]
-                        if filteredLatest[j].collectionType <> "boxsets" and filteredLatest[j].collectionType <> "livetv" and filteredLatest[j].collectionType <> "CollectionFolder" and filteredLatest[j].collectionType <> "folders"
-                            filteredOrderedViews.push(orderedViews[i])
-                            exit for
-                        end if
-                    end if
-                end for
-            end for
-        end if
-    end if
-    if filteredOrderedViews.count() <> 0
-        for i = 0 to filteredOrderedViews.count() - 1
-            for each lib in filteredLatest
-                if filteredOrderedViews[i] = lib.id
-                    if lib.collectionType <> "boxsets" and lib.collectionType <> "livetv" and lib.collectionType <> "CollectionFolder" and lib.collectionType <> "folders"
-                        latest_count = latest_count + 1
-                    end if
-                end if
-            end for
-        end for
-    else
-        latest_count = 0
-        for each lib in filteredLatest
-            if lib.collectionType <> "boxsets" and lib.collectionType <> "livetv" and lib.collectionType <> "CollectionFolder" and lib.collectionType <> "folders"
-                latest_count = latest_count + 1
-            end if
-        end for
-    end if
-    m.latestMediaCount = latest_count
-end sub
+            metadata = { "title": lib.name }
+            metadata.Append({ "contentType": lib.json.CollectionType })
+            loadLatest.metadata = metadata
 
-sub onUpdateMyMediaComplete(event)
-    data = event.GetData()
-    ignores = m.sectionIgnores
-    if data = "stop"
-        itemData = m.LoadMyMediaTask.content
-        if itemData.count() = 0
-            ignores.push("smalllibrarytiles")
-            m.sectionIgnores = ignores
-            section = getHomeSectionInt("smalllibrarytiles")
-            index_section = section + 1
-            row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-            if row_index <> invalid
-                homeRows = m.top.content
-                row = homeRows.getChild(row_index)
-                homeRows.removeChild(row)
-            end if
-        end if
-        rebuildItemArray()
-    end if
-end sub
-
-sub onUpdateMyMediaSmallComplete(event)
-    data = event.GetData()
-    ignores = m.sectionIgnores
-    if data = "stop"
-        itemData = m.LoadMyMediaSmallTask.content
-        if itemData.count() = 0
-            ignores.push("librarybuttons")
-            m.sectionIgnores = ignores
-            section = getHomeSectionInt("librarybuttons")
-            index_section = section + 1
-            row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-            if row_index <> invalid
-                homeRows = m.top.content
-                row = homeRows.getChild(row_index)
-                homeRows.removeChild(row)
-            end if
-        end if
-        rebuildItemArray()
-    end if
-end sub
-
-sub onUpdateLatestMediaComplete(event)
-    data = event.GetData()
-    ignores = m.sectionIgnores
-    if data = "stop"
-        itemData = m.LoadLatestMediaTask.content
-        if itemData.count() = 0
-            ignores.push("latestmedia")
-            m.sectionIgnores = ignores
-            section = getHomeSectionInt("latestmedia")
-            index_section = section + 1
-            row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-            if row_index <> invalid
-                homeRows = m.top.content
-                row = homeRows.getChild(row_index)
-                homeRows.removeChild(row)
-            end if
-        end if
-        rebuildItemArray()
-    end if
-end sub
-
-sub onUpdateContinueVideoItemsComplete(event)
-    data = event.GetData()
-    ignores = m.sectionIgnores
-    if data = "stop"
-        itemData = m.LoadContinueVideoTask.content
-        if itemData.count() = 0
-            ignores.push("resume")
-            m.sectionIgnores = ignores
-            section = getHomeSectionInt("resume")
-            index_section = section + 1
-            row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-            if row_index <> invalid
-                homeRows = m.top.content
-                row = homeRows.getChild(row_index)
-                homeRows.removeChild(row)
-            end if
-        end if
-        rebuildItemArray()
-    end if
-end sub
-
-sub onUpdateContinueAudioItemsComplete(event)
-    data = event.GetData()
-    ignores = m.sectionIgnores
-    if data = "stop"
-        itemData = m.LoadContinueAudioTask.content
-        if itemData.count() = 0
-            ignores.push("resumeaudio")
-            m.sectionIgnores = ignores
-            section = getHomeSectionInt("resumeaudio")
-            index_section = section + 1
-            row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-            if row_index <> invalid
-                homeRows = m.top.content
-                row = homeRows.getChild(row_index)
-                homeRows.removeChild(row)
-            end if
-        end if
-        rebuildItemArray()
-    end if
-end sub
-
-sub onUpdateContinueBookItemsComplete(event)
-    data = event.GetData()
-    ignores = m.sectionIgnores
-    if data = "stop"
-        itemData = m.LoadContinueBookTask.content
-        if itemData.count() = 0
-            ignores.push("resumebook")
-            m.sectionIgnores = ignores
-            section = getHomeSectionInt("resumebook")
-            index_section = section + 1
-            row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-            if row_index <> invalid
-                homeRows = m.top.content
-                row = homeRows.getChild(row_index)
-                homeRows.removeChild(row)
-            end if
-        end if
-        rebuildItemArray()
-    end if
-end sub
-
-sub onUpdateNextUpItemsComplete(event)
-    data = event.GetData()
-    ignores = m.sectionIgnores
-    if data = "stop"
-        itemData = m.LoadNextUpTask.content
-        if itemData.count() = 0
-            ignores.push("nextup")
-            m.sectionIgnores = ignores
-            section = getHomeSectionInt("nextup")
-            index_section = section + 1
-            row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-            if row_index <> invalid
-                homeRows = m.top.content
-                row = homeRows.getChild(row_index)
-                homeRows.removeChild(row)
-            end if
-        end if
-        rebuildItemArray()
-    end if
-end sub
-
-sub onUpdateOnNowItemsComplete(event)
-    data = event.GetData()
-    ignores = m.sectionIgnores
-    if data = "stop"
-        itemData = m.LoadOnNowTask.content
-        if itemData.count() = 0
-            ignores.push("livetv")
-            m.sectionIgnores = ignores
-            section = getHomeSectionInt("livetv")
-            index_section = section + 1
-            row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-            if row_index <> invalid
-                homeRows = m.top.content
-                row = homeRows.getChild(row_index)
-                homeRows.removeChild(row)
-            end if
-        end if
-        rebuildItemArray()
-    end if
-end sub
-
-sub createHoldingChildren()
-    ' Creating children to fill later on.
-    ' Welcome Children - Mose
-    home_section_count = getHomeSectionCount()
-    content = m.top.content
-    for i = 1 to home_section_count
-        homeSectionHold = CreateObject("roSGNode", "HomeRow")
-        homeSectionHold.title = Substitute("Loading Section {0}...", i.toStr())
-        content.insertChild(homeSectionHold, i)
-    end for
-    m.top.content = content
-end sub
-
-sub removeHoldingChild(child as integer)
-    content = m.top.content
-    row_index = getRowIndex(Substitute("Loading Section {0}...", child.toStr()))
-    if row_index <> invalid
-        row = content.getChild(row_index)
-        content.removeChild(row)
-        m.top.content = content
-    end if
-end sub
-
-sub rebuildItemArray()
-    section_count = getHomeSectionCount()
-    ignores = m.sectionIgnores
-    m.top.rowItemSize = []
-    newSizeArray = []
-    homesections = []
-    for i = 0 to section_count
-        homesection = get_user_setting(Substitute("display.homesection{0}", i.toStr()))
-        if homesection <> invalid
-            homesections.push(homesection)
+            loadLatest.observeField("content", "updateLatestItems")
+            loadLatest.control = "RUN"
         end if
     end for
-    for i = 0 to homesections.count()
-        ' Loop through ignores
-        if ignores <> invalid and ignores.count() > 0
-            for each ignore in ignores
-                if ignore = homesections[i]
-                    homesections.delete(i)
-                    i--
-                end if
-            end for
-        end if
-    end for
-    for each homesection in homesections
-        if homesection <> invalid
-            if homesection = "latestmedia"
-                userConfig = m.top.userConfig
-                filteredLatest = filterNodeArray(m.libraryData, "id", userConfig.LatestItemsExcludes)
-                for each lib in filteredLatest
-                    if lib.collectionType <> "boxsets" and lib.collectionType <> "livetv"
-                        itemSize = [200, 270]
-                        newSizeArray.push(itemSize)
-                    end if
-                end for
-            end if
-            if homesection <> "latestmedia" and homesection <> "none"
-                itemSize = [464, 261]
-                if homesection = "librarybuttons"
-                    itemSize = [464, 100]
-                else if homesection = "resumebook" or homesection = "livetv"
-                    itemSize = [200, 270]
-                end if
-                newSizeArray.push(itemSize)
-            end if
-        end if
-    end for
-    for each size in newSizeArray
-        ' print "SIZE: " size
-    end for
-    m.top.rowItemSize = newSizeArray
-end sub
-
-sub updateHomeRows()
-    m.LoadContinueVideoTask.observeField("content", "loadHomeSection0")
-    m.LoadContinueVideoTask.control = "RUN"
-end sub
-
-function getHomeSectionInt(section as string)
-    home_section_count = getHomeSectionCount()
-    for i = 0 to home_section_count
-        homesection = get_user_setting(Substitute("display.homesection{0}", i.toStr()))
-        if homesection <> invalid
-            if homesection = section
-                if section = "latestmedia"
-                    return i
-                end if
-                latest_media_int = m.latestMediaInt
-                latestMediaCount = m.latestMediaCount - 1
-                if latest_media_int < i
-                    if latestMediaCount > 0
-                        i = i + latestMediaCount
-                    end if
-                end if
-                return i
-            end if
-        end if
-    end for
-    return -1
-end function
-
-function getHomeSectionCount()
-    latest_media_count = m.latestMediaCount
-    section_count = 0
-    for i = 0 to 6
-        homesection = get_user_setting(Substitute("display.homesection{0}", i.toStr()))
-        if homesection <> "latestmedia" and homesection <> "none"
-            section_count += 1
-        end if
-    end for
-    return section_count + latest_media_count
-end function
-
-sub updateMyMedia()
-    homeRows = m.top.content
-    section = getHomeSectionInt("smalllibrarytiles")
-    m.LoadMyMediaTask.control = "RUN"
-    itemData = m.LoadMyMediaTask.content
-    m.LoadMyMediaTask.unobserveField("content")
-
-    itemSize = [464, 261]
-
-    latest_media_int = m.latestMediaInt
-    latestMediaCount = m.latestMediaCount - 1
-    if latest_media_int < section
-        if latestMediaCount > 0
-            section = section + latestMediaCount
-        end if
-    end if
-
-    index_section = section + 1
-    row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-    if row_index <> invalid
-        row = homeRows.getChild(row_index)
-        row.title = tr("My Media")
-        row.id = section
-        for each item in itemData
-            item.usePoster = true
-            item.imageWidth = 464
-            row.appendChild(item)
-        end for
-        updateSizeArray(itemSize, section + latestMediaCount, "replace")
-        row.update(row, false)
-    end if
-end sub
-
-sub updateMyMediaSmall()
-    homeRows = m.top.content
-    section = getHomeSectionInt("librarybuttons")
-    itemData = m.LoadMyMediaSmallTask.content
-    m.LoadMyMediaSmallTask.unobserveField("content")
-
-    itemSize = [464, 100]
-
-    latest_media_int = m.latestMediaInt
-    latestMediaCount = m.latestMediaCount - 1
-    if latest_media_int < section
-        if latestMediaCount > 0
-            section = section + latestMediaCount
-        end if
-    end if
-
-    index_section = section + 1
-    row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-    if row_index <> invalid
-        row = homeRows.getChild(row_index)
-        row.title = tr("My Media")
-        for each item in itemData
-            item.usePoster = false
-            item.isSmall = true
-            item.iconUrl = ""
-            row.appendChild(item)
-        end for
-        updateSizeArray(itemSize, section + latestMediaCount, "replace")
-        row.update(row, false)
-    end if
-end sub
-
-sub updateLatestMedia()
-    userConfig = m.top.userConfig
-    filteredLatest = filterNodeArray(m.libraryData, "id", userConfig.LatestItemsExcludes)
-    latest_count = 0
-
-    ' Have to filter the orderedViews because Brightscript is awesome
-    userConfig = ParseJson(get_user_setting("display.userConfig"))
-    orderedViews = userConfig.Configuration.OrderedViews
-    filteredOrderedViews = []
-    if userConfig <> invalid
-        if orderedViews <> invalid
-            for i = 0 to orderedViews.count() - 1
-                for j = 0 to filteredLatest.count() - 1
-                    if filteredLatest[j].id = orderedViews[i]
-                        if filteredLatest[j].collectionType <> "boxsets" and filteredLatest[j].collectionType <> "livetv" and filteredLatest[j].collectionType <> "CollectionFolder" and filteredLatest[j].collectionType <> "folders"
-                            filteredOrderedViews.push(orderedViews[i])
-                            exit for
-                        end if
-                    end if
-                end for
-            end for
-        end if
-    end if
-    if filteredOrderedViews.count() <> 0
-        for i = 0 to filteredOrderedViews.count() - 1
-            for each lib in filteredLatest
-                if filteredOrderedViews[i] = lib.id
-                    if lib.collectionType <> "boxsets" and lib.collectionType <> "livetv" and lib.collectionType <> "CollectionFolder" and lib.collectionType <> "folders"
-                        latest_count = latest_count + 1
-                        loadLatest = createObject("roSGNode", "LoadItemsTask")
-                        loadLatest.itemsToLoad = "latest"
-                        loadLatest.itemId = lib.id
-                        loadLatest.nodeNumber = i
-
-                        metadata = { "title": lib.name }
-                        metadata.Append({ "contentType": lib.json.CollectionType })
-                        loadLatest.metadata = metadata
-
-                        loadLatest.observeField("content", "updateLatestItems")
-                        loadLatest.control = "RUN"
-                    end if
-                end if
-            end for
-        end for
-    else
-        latest_count = 0
-        for each lib in filteredLatest
-            if lib.collectionType <> "boxsets" and lib.collectionType <> "livetv" and lib.collectionType <> "CollectionFolder" and lib.collectionType <> "folders"
-                loadLatest = createObject("roSGNode", "LoadItemsTask")
-                loadLatest.itemsToLoad = "latest"
-                loadLatest.itemId = lib.id
-                loadLatest.nodeNumber = latest_count
-                latest_count = latest_count + 1
-
-                metadata = { "title": lib.name }
-                metadata.Append({ "contentType": lib.json.CollectionType })
-                loadLatest.metadata = metadata
-
-                loadLatest.observeField("content", "updateLatestItems")
-                loadLatest.control = "RUN"
-            end if
-        end for
-    end if
-end sub
-
-sub updateContinueVideoItems()
-    homeRows = m.top.content
-    section = getHomeSectionInt("resume")
-    itemData = m.LoadContinueVideoTask.content
-    m.LoadContinueVideoTask.unobserveField("content")
-
-    itemSize = [464, 331]
-
-    latest_media_int = m.latestMediaInt
-    latestMediaCount = m.latestMediaCount - 1
-    if latest_media_int < section
-        if latestMediaCount > 0
-            section = section + latestMediaCount
-        end if
-    end if
-
-    index_section = section + 1
-    row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-    if row_index <> invalid
-        row = homeRows.getChild(row_index)
-        row.title = tr("Continue Watching")
-        item_count = itemData.count()
-        if item_count > 50
-            item_count = 50
-        end if
-        if item_count = 0
-            homeRows.removeChild(row)
-        end if
-        for i = 0 to item_count
-            if itemData[i] <> invalid
-                itemData[i].usePoster = true
-                itemData[i].imageWidth = 464
-                itemData[i].stretch = true
-                row.appendChild(itemData[i])
-            end if
-        end for
-
-        updateSizeArray(itemSize, section + latestMediaCount, "replace")
-        row.update(row, false)
-    end if
-end sub
-
-sub updateContinueAudioItems()
-    homeRows = m.top.content
-    section = getHomeSectionInt("resumeaudio")
-    itemData = m.LoadContinueAudioTask.content
-    m.LoadContinueAudioTask.unobserveField("content")
-
-    itemSize = [464, 331]
-
-    latest_media_int = m.latestMediaInt
-    latestMediaCount = m.latestMediaCount - 1
-    if latest_media_int < section
-        if latestMediaCount > 0
-            section = section + latestMediaCount
-        end if
-    end if
-
-    index_section = section + 1
-    row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-    if row_index <> invalid
-        row = homeRows.getChild(row_index)
-        row.title = tr("Continue Listening")
-        item_count = itemData.count()
-        if item_count > 1000
-            item_count = 1000
-        end if
-        if item_count = 0
-            homeRows.removeChild(row)
-        end if
-        for i = 0 to item_count
-            if itemData[i] <> invalid
-                itemData[i].usePoster = true
-                itemData[i].imageWidth = 464
-                row.appendChild(itemData[i])
-            end if
-        end for
-
-        updateSizeArray(itemSize, section + latestMediaCount, "replace")
-        row.update(row, false)
-    end if
-end sub
-
-sub updateContinueBookItems()
-    homeRows = m.top.content
-    section = getHomeSectionInt("resumebook")
-    itemData = m.LoadContinueBookTask.content
-    m.LoadContinueBookTask.unobserveField("content")
-
-    itemSize = [200, 270]
-
-    latest_media_int = m.latestMediaInt
-    latestMediaCount = m.latestMediaCount - 1
-    if latest_media_int < section
-        if latestMediaCount > 0
-            section = section + latestMediaCount
-        end if
-    end if
-
-    index_section = section + 1
-    row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-    if row_index <> invalid
-        row = homeRows.getChild(row_index)
-        row.title = tr("Continue Reading")
-        item_count = itemData.count()
-        if item_count > 1000
-            item_count = 1000
-        end if
-        if item_count = 0
-            homeRows.removeChild(row)
-        end if
-        for i = 0 to item_count
-            if itemData[i] <> invalid
-                itemData[i].usePoster = true
-                itemData[i].imageWidth = 200
-                row.appendChild(itemData[i])
-
-            end if
-        end for
-
-        row.update(row, false)
-        updateSizeArray(itemSize, section + latestMediaCount, "replace")
-    end if
-end sub
-
-sub updateNextUpItems()
-    itemData = m.LoadNextUpTask.content
-    m.LoadNextUpTask.unobserveField("content")
-
-    itemSize = [464, 331]
-
-    homeRows = m.top.content
-    section = getHomeSectionInt("nextup")
-
-    latest_media_int = m.latestMediaInt
-    latestMediaCount = m.latestMediaCount - 1
-    if latest_media_int < section
-        if latestMediaCount > 0
-            section = section + latestMediaCount
-        end if
-    end if
-
-    index_section = section + 1
-    row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-    if row_index <> invalid
-        row = homeRows.getChild(row_index)
-        row.title = tr("Next Up") + " >"
-        item_count = itemData.count()
-        if item_count > 1000
-            item_count = 1000
-        end if
-        if item_count = 0
-            homeRows.removeChild(row)
-        end if
-        for i = 0 to item_count
-            if itemData[i] <> invalid
-                itemData[i].usePoster = false
-                itemData[i].imageWidth = 464
-                row.appendChild(itemData[i])
-            end if
-        end for
-
-        updateSizeArray(itemSize, section + latestMediaCount, "replace")
-        row.update(row, false)
-    end if
 end sub
 
 sub updateLatestItems(msg)
@@ -766,83 +227,102 @@ sub updateLatestItems(msg)
 
     node = msg.getRoSGNode()
     node.unobserveField("content")
+    node.content = []
+
+    if itemData = invalid then return
 
     homeRows = m.top.content
-    section = getHomeSectionInt("latestmedia")
-    node_index = node.nodeNumber
+    rowIndex = getRowIndex(tr("Latest in") + " " + node.metadata.title + " >")
 
-    index_section = section + 1
-    index_section_latest = index_section + node_index
-    row_index = getRowIndex(Substitute("Loading Section {0}...", index_section_latest.toStr()))
-    if row_index <> invalid
-        row = homeRows.getChild(row_index)
-        item_count = itemData.count()
-        if item_count > 1000
-            item_count = 1000
+    if itemData.count() < 1
+        ' remove row
+        if rowIndex <> invalid
+            deleteFromSizeArray(rowIndex)
+            homeRows.removeChildIndex(rowIndex)
         end if
-        if item_count = 0
-            homeRows.removeChild(row)
+    else
+        ' remake row using new data
+        row = CreateObject("roSGNode", "HomeRow")
+        row.title = tr("Latest in") + " " + node.metadata.title + " >"
+        row.usePoster = true
+        ' Handle specific types with different item widths
+        if node.metadata.contentType = "movies"
+            row.imageWidth = 180
+            itemSize = [188, 331]
+        else if node.metadata.contentType = "music"
+            row.imageWidth = 261
+            itemSize = [261, 331]
+        else
+            row.imageWidth = 464
+            itemSize = [464, 331]
         end if
-        for i = 0 to item_count
-            if itemData[i] <> invalid
-                row.title = tr("Latest in") + " " + node.metadata.title + " >"
-                itemData[i].usePoster = true
-                itemData[i].imageWidth = 200
-                row.appendChild(itemData[i])
-            end if
+
+        for each item in itemData
+            item.usePoster = row.usePoster
+            item.imageWidth = row.imageWidth
+            row.appendChild(item)
         end for
-        row.update(row, false)
+
+        if rowIndex = invalid
+            ' append new row
+            updateSizeArray(itemSize)
+            homeRows.appendChild(row)
+        else
+            ' replace the old row
+            updateSizeArray(itemSize, rowIndex, "replace")
+            homeRows.replaceChild(row, rowIndex)
+        end if
     end if
 end sub
 
 sub updateOnNowItems()
     itemData = m.LoadOnNowTask.content
     m.LoadOnNowTask.unobserveField("content")
+    m.LoadOnNowTask.content = []
 
-    itemSize = [200, 270]
+    if itemData = invalid then return
 
     homeRows = m.top.content
-    section = getHomeSectionInt("livetv")
-    latestMediaCount = m.latestMediaCount - 1
+    onNowRowIndex = getRowIndex("On Now")
 
-    index_section = section + 1
-    row_index = getRowIndex(Substitute("Loading Section {0}...", index_section.toStr()))
-    if row_index <> invalid
-        row = homeRows.getChild(row_index)
+    if itemData.count() < 1
+        if onNowRowIndex <> invalid
+            ' remove the row
+            deleteFromSizeArray(onNowRowIndex)
+            homeRows.removeChildIndex(onNowRowIndex)
+        end if
+    else
+        ' remake row using the new data
+        row = CreateObject("roSGNode", "HomeRow")
         row.title = tr("On Now")
-        item_count = itemData.count()
-        if item_count > 1000
-            item_count = 1000
-        end if
-        if item_count = 0
-            homeRows.removeChild(row)
-        end if
-        for i = 0 to item_count
-            if itemData[i] <> invalid
-                itemData[i].usePoster = true
-                itemData[i].imageWidth = 200
-                row.appendChild(itemData[i])
-            end if
+        itemSize = [464, 331]
+        for each item in itemData
+            item.usePoster = row.usePoster
+            item.imageWidth = row.imageWidth
+            row.appendChild(item)
         end for
-        updateSizeArray(itemSize, section + latestMediaCount, "replace")
-        row.update(row, false)
+
+        if onNowRowIndex = invalid
+            ' insert new row under "My Media"
+            updateSizeArray(itemSize, 1)
+            homeRows.insertChild(row, 1)
+        else
+            ' replace the old row
+            homeRows.replaceChild(row, onNowRowIndex)
+        end if
     end if
 end sub
 
 function getRowIndex(rowTitle as string)
     rowIndex = invalid
-    content = m.top.content
-    if content <> invalid
-        tmpRow = m.top.content
-        for i = 0 to content.getChildCount() - 1
-            tmpRow = content.getChild(i)
-            sub_str = Instr(1, tmpRow.title, rowTitle)
-            if tmpRow.title = rowTitle or sub_str > 0
-                rowIndex = i
-                exit for
-            end if
-        end for
-    end if
+    for i = 1 to m.top.content.getChildCount() - 1
+        ' skip row 0 since it's always "My Media"
+        tmpRow = m.top.content.getChild(i)
+        if tmpRow.title = rowTitle
+            rowIndex = i
+            exit for
+        end if
+    end for
     return rowIndex
 end function
 
@@ -857,20 +337,17 @@ sub updateSizeArray(rowItemSize, rowIndex = invalid, action = "insert")
     for i = 0 to sizeArray.count()
         if rowIndex = i
             if action = "replace"
-                newSizeArray.push(rowItemSize)
+                newSizeArray.Push(rowItemSize)
             else if action = "insert"
-                newSizeArray.push(rowItemSize)
+                newSizeArray.Push(rowItemSize)
                 if sizeArray[i] <> invalid
-                    newSizeArray.push(sizeArray[i])
+                    newSizeArray.Push(sizeArray[i])
                 end if
             end if
         else if sizeArray[i] <> invalid
-            newSizeArray.push(sizeArray[i])
+            newSizeArray.Push(sizeArray[i])
         end if
     end for
-    if newSizeArray.count() = 0
-        newSizeArray.push(rowItemSize)
-    end if
     m.top.rowItemSize = newSizeArray
 end sub
 
diff --git a/components/home/HomeRows.xml b/components/home/HomeRows.xml
index 079bf420..159a1c34 100644
--- a/components/home/HomeRows.xml
+++ b/components/home/HomeRows.xml
@@ -7,6 +7,5 @@
     <function name="updateHomeRows" />
     <function name="loadLibraries" />
   </interface>
-  <script type="text/brightscript" uri="pkg:/source/utils/config.brs" />
   <script type="text/brightscript" uri="HomeRows.brs"/>
 </component>
diff --git a/components/home/LoadItemsTask.brs b/components/home/LoadItemsTask.brs
index 72ee1be4..a53b7686 100644
--- a/components/home/LoadItemsTask.brs
+++ b/components/home/LoadItemsTask.brs
@@ -13,9 +13,12 @@ sub loadItems()
         resp = APIRequest(url)
         data = getJson(resp)
         for each item in data.Items
-            tmp = CreateObject("roSGNode", "HomeData")
-            tmp.json = item
-            results.push(tmp)
+            ' Skip Books for now as we don't support it (issue #525)
+            if item.CollectionType <> "books"
+                tmp = CreateObject("roSGNode", "HomeData")
+                tmp.json = item
+                results.push(tmp)
+            end if
         end for
 
         ' Load Latest Additions to Libraries
@@ -27,20 +30,17 @@ sub loadItems()
         params["ParentId"] = m.top.itemId
         params["EnableImageTypes"] = "Primary,Backdrop,Thumb"
         params["ImageTypeLimit"] = 1
-        params["fields"] = "PrimaryImageAspectRatio,BasicSyncInfo,Path"
-        params["MaxWidth"] = 416
-        params["MaxHeight"] = 416
+
         resp = APIRequest(url, params)
         data = getJson(resp)
 
         for each item in data
-            tmp = CreateObject("roSGNode", "HomeData")
-            item.ImageURL = ImageURL(item.Id, "Primary", params)
-            if item.type = "Episode"
-                item.ImageURL = ImageURL(item.Id)
+            ' Skip Books for now as we don't support it (issue #525)
+            if item.Type <> "Book"
+                tmp = CreateObject("roSGNode", "HomeData")
+                tmp.json = item
+                results.push(tmp)
             end if
-            tmp.json = item
-            results.push(tmp)
         end for
 
         ' Load Next Up
@@ -48,7 +48,6 @@ sub loadItems()
 
         url = "Shows/NextUp"
         params = {}
-        params["Limit"] = 30
         params["recursive"] = true
         params["SortBy"] = "DatePlayed"
         params["SortOrder"] = "Descending"
@@ -59,96 +58,38 @@ sub loadItems()
         data = getJson(resp)
         for each item in data.Items
             tmp = CreateObject("roSGNode", "HomeData")
-            if item.type = "Episode"
-                item.ImageURL = ImageURL(item.SeriesId, "Backdrop")
-            else
-                item.ImageURL = ImageURL(item.Id, "Backdrop")
-            end if
-            item.stretch = true
             tmp.json = item
             results.push(tmp)
         end for
 
         ' Load Continue Watching
-    else if m.top.itemsToLoad = "continueVideo"
+    else if m.top.itemsToLoad = "continue"
 
         url = Substitute("Users/{0}/Items/Resume", get_setting("active_user"))
 
         params = {}
-        params["Limit"] = 30
         params["recursive"] = true
         params["SortBy"] = "DatePlayed"
         params["SortOrder"] = "Descending"
         params["Filters"] = "IsResumable"
-        params["MediaTypes"] = "Video"
-        params["EnableImageTypes"] = "Primary,Backdrop,Thumb"
-        params["ImageTypeLimit"] = 1
 
         resp = APIRequest(url, params)
         data = getJson(resp)
         for each item in data.Items
-            tmp = CreateObject("roSGNode", "HomeData")
-            if item.type = "Episode"
-                item.ImageURL = ImageURL(item.SeriesId, "Backdrop")
-            else
-                item.ImageURL = ImageURL(item.Id, "Backdrop")
+            ' Skip Books for now as we don't support it (issue #558)
+            if item.Type <> "Book"
+                tmp = CreateObject("roSGNode", "HomeData")
+                tmp.json = item
+                results.push(tmp)
             end if
-            item.stretch = true
-            tmp.json = item
-            results.push(tmp)
-        end for
-
-    else if m.top.itemsToLoad = "continueAudio"
-
-        url = Substitute("Users/{0}/Items/Resume", get_setting("active_user"))
-
-        params = {}
-        params["Limit"] = 30
-        params["recursive"] = true
-        params["SortBy"] = "DatePlayed"
-        params["SortOrder"] = "Descending"
-        params["Filters"] = "IsResumable"
-        params["MediaTypes"] = "Audio"
-        params["EnableImageTypes"] = "Primary,Backdrop,Thumb"
-        params["ImageTypeLimit"] = 1
-
-        resp = APIRequest(url, params)
-        data = getJson(resp)
-        for each item in data.Items
-            tmp = CreateObject("roSGNode", "HomeData")
-            item.ImageURL = ImageURL(item.Id, "Backdrop")
-            tmp.json = item
-            results.push(tmp)
-        end for
-
-    else if m.top.itemsToLoad = "continueBook"
-
-        url = Substitute("Users/{0}/Items/Resume", get_setting("active_user"))
-
-        params = {}
-        params["Limit"] = 30
-        params["recursive"] = true
-        params["SortBy"] = "DatePlayed"
-        params["SortOrder"] = "Descending"
-        params["Filters"] = "IsResumable"
-        params["MediaTypes"] = "Book"
-        params["EnableImageTypes"] = "Primary,Backdrop,Thumb"
-
-        resp = APIRequest(url, params)
-        data = getJson(resp)
-        for each item in data.Items
-            tmp = CreateObject("roSGNode", "HomeData")
-            item.ImageURL = ImageURL(item.Id, "Backdrop")
-            tmp.json = item
-            results.push(tmp)
         end for
 
     else if m.top.itemsToLoad = "onNow"
         url = "LiveTv/Programs/Recommended"
         params = {}
-        params["Limit"] = 30
         params["userId"] = get_setting("active_user")
         params["isAiring"] = true
+        params["limit"] = 16 ' 16 to be consistent with "Latest In"
         params["imageTypeLimit"] = 1
         params["enableImageTypes"] = "Primary,Thumb,Backdrop"
         params["enableTotalRecordCount"] = false
diff --git a/components/home/LoadItemsTask.xml b/components/home/LoadItemsTask.xml
index 5dcd5bb0..db0bb0cf 100644
--- a/components/home/LoadItemsTask.xml
+++ b/components/home/LoadItemsTask.xml
@@ -4,7 +4,6 @@
   <interface>
     <field id="itemsToLoad" type="string" value="libraries" />
     <field id="itemId" type="string" />
-    <field id="nodeNumber" type="integer" />
     <field id="metadata" type="assocarray" />
     <field id="peopleList" type="array" />
     <field id="content" type="array" />
diff --git a/locale/en_US/translations.ts b/locale/en_US/translations.ts
index 3a20ab52..d2ccf5a6 100644
--- a/locale/en_US/translations.ts
+++ b/locale/en_US/translations.ts
@@ -585,6 +585,7 @@
         <source>Shows</source>
         <translation>Shows</translation>
     </message>
+    <message>
         <source>Return to Top</source>
         <translation>Return to Top</translation>
         <extracomment>UI -> Media Grid -> Item Title in user setting screen.</extracomment>
diff --git a/source/Main.brs b/source/Main.brs
index e42be957..0aca3c9d 100644
--- a/source/Main.brs
+++ b/source/Main.brs
@@ -166,7 +166,7 @@ sub Main (args as dynamic) as void
                 group = CreateAudioPlayerGroup([selectedItem.json])
             else
                 ' TODO - switch on more node types
-                message_dialog(Substitute(tr("{0} support is coming soon!"), selectedItem.type))
+                message_dialog("This type is not yet supported: " + selectedItem.type + ".")
             end if
         else if isNodeEvent(msg, "movieSelected")
             ' If you select a movie from ANYWHERE, follow this flow
diff --git a/source/api/Image.brs b/source/api/Image.brs
index 9c91201a..8f70f4fd 100644
--- a/source/api/Image.brs
+++ b/source/api/Image.brs
@@ -38,15 +38,15 @@ end function
 function ImageURL(id, version = "Primary", params = {})
     ' set defaults
     if params.maxHeight = invalid
-        param = { "fillHeight": "331" }
+        param = { "maxHeight": "384" }
         params.append(param)
     end if
     if params.maxWidth = invalid
-        param = { "fillWidth": "464" }
+        param = { "maxWidth": "196" }
         params.append(param)
     end if
     if params.quality = invalid
-        param = { "quality": "96" }
+        param = { "quality": "90" }
         params.append(param)
     end if
     url = Substitute("Items/{0}/Images/{1}", id, version)
@@ -63,7 +63,7 @@ function UserImageURL(id, params = {})
         params.append({ "maxWidth": "300" })
     end if
     if params.quality = invalid
-        params.append({ "quality": "96" })
+        params.append({ "quality": "90" })
     end if
 
     url = Substitute("Users/{0}/Images/Primary", id)
diff --git a/source/api/userauth.brs b/source/api/userauth.brs
index 23b4703a..a98618a4 100644
--- a/source/api/userauth.brs
+++ b/source/api/userauth.brs
@@ -141,52 +141,11 @@ sub LoadUserPreferences()
     resp = APIRequest(url)
     jsonResponse = getJson(resp)
 
-    if jsonResponse <> invalid and jsonResponse.CustomPrefs <> invalid
-        if jsonResponse.CustomPrefs["landing-livetv"] <> invalid
-            set_user_setting("display.livetv.landing", jsonResponse.CustomPrefs["landing-livetv"])
-        end if
-        ' Take into account nones, if nones are in the middle then resort them to the end to be removed later in HomeRows
-        nones = 0
-        for i = 0 to 6
-            if jsonResponse.CustomPrefs["homesection" + i.ToStr()] <> invalid
-                if jsonResponse.CustomPrefs["homesection" + i.ToStr()] = "none"
-                    nones += 1
-                else
-                    if nones > 0
-                        j = i - nones
-                        set_user_setting("display.homesection" + i.ToStr(), "none")
-                        set_user_setting("display.homesection" + j.ToStr(), jsonResponse.CustomPrefs["homesection" + i.ToStr()])
-                    else
-                        set_user_setting("display.homesection" + i.ToStr(), jsonResponse.CustomPrefs["homesection" + i.ToStr()])
-                    end if
-                end if
-            end if
-        end for
-        if jsonResponse.CustomPrefs["homesection0"] = invalid
-            setHomeScreenDefaults()
-        end if
+    if jsonResponse <> invalid and jsonResponse.CustomPrefs <> invalid and jsonResponse.CustomPrefs["landing-livetv"] <> invalid
+        set_user_setting("display.livetv.landing", jsonResponse.CustomPrefs["landing-livetv"])
     else
-        setHomeScreenDefaults()
+        unset_user_setting("display.livetv.landing")
     end if
-
-    ' Actual user settings for getting ordered views
-    url = Substitute("Users/{0}", id)
-    resp = APIRequest(url)
-    jsonResponse = getJson(resp)
-    if jsonResponse <> invalid
-        set_user_setting("display.userConfig", FormatJson(jsonResponse))
-    end if
-
-end sub
-
-sub setHomeScreenDefaults()
-    set_user_setting("display.homesection0", "smalllibrarytiles")
-    set_user_setting("display.homesection1", "resume")
-    set_user_setting("display.homesection2", "resumeaudio")
-    set_user_setting("display.homesection3", "resumebook")
-    set_user_setting("display.homesection4", "livetv")
-    set_user_setting("display.homesection5", "nextup")
-    set_user_setting("display.homesection6", "latestmedia")
 end sub
 
 sub LoadUserAbilities(user)