diff --git a/OrderScreen/Controller.fs b/OrderScreen/Controller.fs
index fa4e713..92a4b18 100644
--- a/OrderScreen/Controller.fs
+++ b/OrderScreen/Controller.fs
@@ -37,6 +37,13 @@ let loadOrderScreenView (ctx: HttpContext)  (tableNumber: int) =
         |> Array.filter (fun page_group -> page_group.id <> 0)
         |> Array.sortBy (fun {order=order} -> order)
 
+(*    let grids =
+        Model.getAllPageGridsInVenue ()
+        |> Array.map(fun (grid, page_group) ->
+
+        )
+        |>*)
+
     View.index tableNumber styles scripts metaTags currentClerk orderScreenPageGroups
 
 let loadOrderScreen (ctx: HttpContext)  (tableNumber: int) : HttpHandler =
@@ -71,7 +78,7 @@ let loadOrderScreen (ctx: HttpContext)  (tableNumber: int) : HttpHandler =
         |> joinWithNewLine
 
    let grids =
-       Model.getAllPageGrids ()
+       Model.getAllPageGridsInVenue ()
        |> Array.map Model.getPagesHTML
        |> joinWithNewLine
 
diff --git a/OrderScreen/Model.fs b/OrderScreen/Model.fs
index f7e59f8..646e8ce 100644
--- a/OrderScreen/Model.fs
+++ b/OrderScreen/Model.fs
@@ -8,9 +8,10 @@ open Thoth.Json.Net
 open Theme
 
 
-let getAllPageGrids () = Entity.GetAllInVenue<order_screen_page_group>
-                         |> Array.filter(fun pageGroup -> pageGroup.grid_id <> 0)
-                         |> Array.map(fun pageGroup -> (Entity.GetById<grid> pageGroup.grid_id), pageGroup)
+let getAllPageGridsInVenue () =
+    Entity.GetAllInVenue<order_screen_page_group>
+    |> Array.filter(fun pageGroup -> pageGroup.grid_id <> 0)
+    |> Array.map(fun pageGroup -> (Entity.GetById<grid> pageGroup.grid_id), pageGroup)
 
 let getImageButtonData (button: button) =
     let itemCode =
diff --git a/OrderScreen/View.fs b/OrderScreen/View.fs
index 77a8ead..f742acd 100644
--- a/OrderScreen/View.fs
+++ b/OrderScreen/View.fs
@@ -66,7 +66,7 @@ let pageContainer floorplanTable (clerk: clerk) orderScreenPageGroups =
                     yield! orderScreenPageGroups
                 ]
                 div [_id "pageGroupContainer"] [
-                    (* Page Groups *)
+
                 ]
                 div [_class "pagNavigation"] [
                     posButton "prevButton" [] ["prev_page" |> get |> str]
@@ -99,6 +99,11 @@ let gridContainer =
 
 let pageGroupButton (pageGroup: order_screen_page_group) = posButton "loadPageGroup" [] [str pageGroup.label]
 
+let pageGroup grids =
+    div [_class "pageGroup"] [
+        yield! grids
+    ]
+
 let index orderNumber styles scripts tags clerk (orderScreenPageGroups: order_screen_page_group[])  =
 
     let orderScreenPageGroupButtons =