diff --git a/source/php/Component/Group/Group.php b/source/php/Component/Group/Group.php
index 762da25e..5fd0c0c5 100644
--- a/source/php/Component/Group/Group.php
+++ b/source/php/Component/Group/Group.php
@@ -14,8 +14,10 @@ public function init()
         extract($this->data);
 
         if (!empty($fluidGrid)) {
+            $fluidGrid = is_numeric($fluidGrid) ? $fluidGrid : 3;
             $this->data['containerAware'] = true;
             $this->data['classList'][] = $this->getBaseClass('fluid-grid', true);
+            $this->data['classList'][] = $this->getBaseClass('fluid-grid-' . $fluidGrid, true);
         }
 
         if ($direction == "vertical") {
@@ -29,7 +31,7 @@ public function init()
         }
         
         if (!empty($gap)) {
-            $this->data['classList'][] = $this->getBaseClass('gap-' . $gap, true);      
+            $this->data['classList'][] = $this->getBaseClass('gap-' . $gap, true);
         }
         
         if (!empty($alignItems)) {
diff --git a/source/php/Component/Group/group.json b/source/php/Component/Group/group.json
index 643dd7a9..9ee9ba1d 100644
--- a/source/php/Component/Group/group.json
+++ b/source/php/Component/Group/group.json
@@ -10,7 +10,7 @@
         "flexGrow": false,
         "flexShrink": true,
         "gap": "",
-        "fluidGrid": false,
+        "fluidGrid": null,
         "columns": null
     },
     "description": {
@@ -23,7 +23,7 @@
         "flexGrow": "Allow to grow the content within the group",
         "flexShrink": "Allow to shrink the content within the group",
         "gap": "A number between 1-10 that sets the gap between flexed elements.",
-        "fluidGrid": "Uses flexbox and media queries to determine amount of items per row.",
+        "fluidGrid": "Uses flexbox and media queries to determine amount of items per row. Can be a number between 1-4 which will determine the maximum amount of items per row.",
         "columns": "Number of items per row. (number between 1-12)"
     },
     "view": "group.blade.php",