diff --git a/RetroFE/Source/Graphics/Page.cpp b/RetroFE/Source/Graphics/Page.cpp
index b88bb09..b889fff 100644
--- a/RetroFE/Source/Graphics/Page.cpp
+++ b/RetroFE/Source/Graphics/Page.cpp
@@ -703,7 +703,7 @@ void Page::draw()
     {
         for(std::vector<Component *>::iterator it = LayerComponents[i].begin(); it != LayerComponents[i].end(); ++it)
         {
-            if(*it) (*it)->draw();
+            if(*it && (*it)->baseViewInfo.Layer == i) (*it)->draw();
         }
 
         for(MenuVector_T::iterator it = menus_.begin(); it != menus_.end(); it++)
diff --git a/RetroFE/Source/Graphics/Page.h b/RetroFE/Source/Graphics/Page.h
index 77c2082..a53e28c 100644
--- a/RetroFE/Source/Graphics/Page.h
+++ b/RetroFE/Source/Graphics/Page.h
@@ -111,7 +111,7 @@ private:
     CollectionVector_T collections_;
     CollectionVector_T deleteCollections_;
 
-    static const unsigned int NUM_LAYERS = 8;
+    static const unsigned int NUM_LAYERS = 20;
     std::vector<Component *> LayerComponents[NUM_LAYERS];
     std::list<ScrollingList *> deleteMenuList_;
     std::list<CollectionInfo *> deleteCollectionList_;