diff --git a/libraries/render-utils/src/LightClusterGrid.slh b/libraries/render-utils/src/LightClusterGrid.slh
index f4ec35a75c..722d37814d 100644
--- a/libraries/render-utils/src/LightClusterGrid.slh
+++ b/libraries/render-utils/src/LightClusterGrid.slh
@@ -24,7 +24,7 @@ struct FrustumGrid {
     mat4 eyeToWorldMat;
 };
 
-uniform frustumGridBuffer {
+layout(std140) uniform frustumGridBuffer {
     FrustumGrid frustumGrid;
 };
 
@@ -51,16 +51,20 @@ float projection_getFar(mat4 projection) {
 #define GRID_INDEX_TYPE ivec4
 #define GRID_FETCH_BUFFER(i) i / 4][i % 4
 <@else@>
-#define GRID_NUM_ELEMENTS 16384
+#define GRID_NUM_ELEMENTS 4096
+#define GRID_INDEX_TYPE ivec4
+#define GRID_FETCH_BUFFER(i) i / 4][i % 4
+
+<!#define GRID_NUM_ELEMENTS 16384
 #define GRID_INDEX_TYPE int
-#define GRID_FETCH_BUFFER(i) i
+#define GRID_FETCH_BUFFER(i) i!>
 <@endif@>
 
-uniform clusterGridBuffer {
+layout(std140) uniform clusterGridBuffer {
     GRID_INDEX_TYPE _clusterGridTable[GRID_NUM_ELEMENTS];
 };
 
-uniform clusterContentBuffer {
+layout(std140) uniform clusterContentBuffer {
     GRID_INDEX_TYPE _clusterGridContent[GRID_NUM_ELEMENTS];
 };
 
diff --git a/libraries/render-utils/src/LightClusters.cpp b/libraries/render-utils/src/LightClusters.cpp
index d3a384f1df..8dc95da65b 100644
--- a/libraries/render-utils/src/LightClusters.cpp
+++ b/libraries/render-utils/src/LightClusters.cpp
@@ -27,21 +27,21 @@
 
 enum LightClusterGridShader_MapSlot {
     DEFERRED_BUFFER_LINEAR_DEPTH_UNIT = 0,
-    DEFERRED_BUFFER_COLOR_UNIT,
-    DEFERRED_BUFFER_NORMAL_UNIT,
-    DEFERRED_BUFFER_EMISSIVE_UNIT,
-    DEFERRED_BUFFER_DEPTH_UNIT,
+    DEFERRED_BUFFER_COLOR_UNIT = 1,
+    DEFERRED_BUFFER_NORMAL_UNIT = 2,
+    DEFERRED_BUFFER_EMISSIVE_UNIT = 3,
+    DEFERRED_BUFFER_DEPTH_UNIT = 4,
 };
 
 enum LightClusterGridShader_BufferSlot {
     LIGHT_CLUSTER_GRID_FRUSTUM_GRID_SLOT = 0,
-    DEFERRED_FRAME_TRANSFORM_BUFFER_SLOT,
-    CAMERA_CORRECTION_BUFFER_SLOT,
+    DEFERRED_FRAME_TRANSFORM_BUFFER_SLOT =1,
+    CAMERA_CORRECTION_BUFFER_SLOT = 2,
     LIGHT_GPU_SLOT = render::ShapePipeline::Slot::LIGHT,
-    LIGHT_INDEX_GPU_SLOT,
+    LIGHT_INDEX_GPU_SLOT = 5,
 
-    LIGHT_CLUSTER_GRID_CLUSTER_GRID_SLOT,
-    LIGHT_CLUSTER_GRID_CLUSTER_CONTENT_SLOT,
+    LIGHT_CLUSTER_GRID_CLUSTER_GRID_SLOT = 6,
+    LIGHT_CLUSTER_GRID_CLUSTER_CONTENT_SLOT = 7,
 };
 
 FrustumGrid::FrustumGrid(const FrustumGrid& source) :
diff --git a/libraries/render-utils/src/local_lights_shading.slf b/libraries/render-utils/src/local_lights_shading.slf
index 0b884d8bc0..a4e28a9757 100644
--- a/libraries/render-utils/src/local_lights_shading.slf
+++ b/libraries/render-utils/src/local_lights_shading.slf
@@ -34,7 +34,6 @@ in vec2 _texCoord0;
 out vec4 _fragColor;
 
 void main(void) {
-
     // Grab the fragment data from the uv
     vec2 texCoord = _texCoord0.st;
 
@@ -49,7 +48,7 @@ void main(void) {
     // Frag pos in world
     mat4 invViewMat = getViewInverse();
     vec4 fragPos = invViewMat * fragPosition;
-    
+
     // From frag world pos find the cluster
     vec4 clusterEyePos = frustumGrid_worldToEye(fragPos);
     ivec3 clusterPos = frustumGrid_eyeToClusterPos(clusterEyePos.xyz);
@@ -84,7 +83,7 @@ void main(void) {
     vec4 fragEyeVector = invViewMat * vec4(-frag.position.xyz, 0.0);
     vec3 fragEyeDir = normalize(fragEyeVector.xyz);
 
-    // COmpute the rougness into gloss2 once:
+    // Compute the rougness into gloss2 once:
     float fragGloss2 = pow(frag.roughness + 0.001, 4.0);
     bool withScattering = (frag.scattering * isScatteringEnabled() > 0.0);