diff --git a/client/components/GridHexagon/GridText.js b/client/components/GridHexagon/GridText.js
index ae25eba4..3bdd8df5 100644
--- a/client/components/GridHexagon/GridText.js
+++ b/client/components/GridHexagon/GridText.js
@@ -26,7 +26,7 @@ class GridText extends Component {
       )
     else {
         const splitted_string = []
-        let remaining_string = children
+        let remaining_string = children.length > 30 ? children.slice(0, 27) + '...' : children
         /*if (remaining_string.includes(': ') && remaining_string.length >= 18){
             const temp = remaining_string.split(': ')
             splited_string.push(temp[0] + ':')
diff --git a/client/components/GridHexagon/index.js b/client/components/GridHexagon/index.js
index 05ebf17b..25fbd183 100644
--- a/client/components/GridHexagon/index.js
+++ b/client/components/GridHexagon/index.js
@@ -154,7 +154,7 @@ const HexagonTest = props => {
                 .filter(concept => concept.hex_coords)
                 .map(hex => (
                   <ConstructionHexagon
-                    name={hex.short_name}
+                    name={hex.name}
                     position={hex.hex_coords}
                     statistics={accumulatedConcepts[hex.concept_id]}
                     overallTotal={getBiggestHistoryTotal()}