diff --git a/Modules/ValuesViewer/valueelement.cpp b/Modules/ValuesViewer/valueelement.cpp
index 630ef206841be2c703dd1d114bf4334cfaab4b5e..d54c7ecb36080a41e48003c5aba507eaed49192e 100644
--- a/Modules/ValuesViewer/valueelement.cpp
+++ b/Modules/ValuesViewer/valueelement.cpp
@@ -134,8 +134,13 @@ QString ValueElement::getCurrentValue() const
 
 bool ValueElement::updateCurrentValue(const QString &value)
 {
-    if(value == getReceivedValue()){
-        currentValue = getDisplayedValue();
+    if(getReceivedValue() == "" || value == getReceivedValue()){
+        if(getDisplayedValue() != ""){
+            currentValue = getDisplayedValue();
+        }
+        else{
+            currentValue = value;
+        }
         return true;
     }
     return false;
diff --git a/Modules/ValuesViewer/valuesviewermodule.cpp b/Modules/ValuesViewer/valuesviewermodule.cpp
index e92507ff3ffa337025fc51da4e4d89222984dd0f..b3491cf95fa1166f2bc35e6a92e1b796cf8a95fd 100644
--- a/Modules/ValuesViewer/valuesviewermodule.cpp
+++ b/Modules/ValuesViewer/valuesviewermodule.cpp
@@ -103,6 +103,7 @@ void ValuesViewerModule::createLabels()
     }
 
     int col = 0;
+    int row = 0;
     for (int i = 0; i < rules.count(); i++ ) {
         QLabel *label;
 
@@ -112,9 +113,9 @@ void ValuesViewerModule::createLabels()
         }
         else{
             label = createView(rules[i]);
-            int row = i/columns;
             if(col == columns){
                 col = 0;
+                row++;
             }
             ui->mainLayout_grid->addWidget(label, row, col);
             col++;
diff --git a/SkywardHub.pro.user b/SkywardHub.pro.user
index 6bb8e65bf998480e3a061039a6f8e0b891565177..7d4088b022199bc8d7b419ca5a138773ba38a57f 100644
--- a/SkywardHub.pro.user
+++ b/SkywardHub.pro.user
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 4.14.2, 2021-08-11T21:04:23. -->
+<!-- Written by QtCreator 4.14.2, 2021-08-12T14:50:14. -->
 <qtcreator>
  <data>
   <variable>EnvironmentId</variable>