diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99fc298ae0193e8fd99bd41f570ab9440824ac3f..1d1628e52fc224afacf2d2e1ca08113e5db7ee4e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -82,6 +82,7 @@ add_executable(groundstation
     src/shared/Modules/OrientationVisualizer/OrientationVisualizer.cpp
     src/shared/Modules/MainStateViewer/MainStateViewer.cpp
     src/shared/Modules/PayloadStateViewer/PayloadStateViewer.cpp
+    src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
     src/shared/Modules/RefuelingButton/RefuelingButton.cpp
     src/shared/Modules/RefuelingButton/MessageFormElementRefButton.cpp
     src/shared/Modules/Tabs/TabsModule.cpp
diff --git a/src/shared/Modules/RefuelingButton/RefuelingButton.cpp b/src/shared/Modules/RefuelingButton/RefuelingButton.cpp
index 2a5583e52eab21da6e18d7be955b88f570046d4b..165e5285e2a1beeadf1d5bc49e3aee240a3047a0 100644
--- a/src/shared/Modules/RefuelingButton/RefuelingButton.cpp
+++ b/src/shared/Modules/RefuelingButton/RefuelingButton.cpp
@@ -242,8 +242,9 @@ void RefuelingButton::setupUi()
 
                 // Once the message is created we can fill the fields
                 // according to the struct defined before
-                mavlink_message_info_t infos[256] = MAVLINK_MESSAGE_INFO;
-                mavlink_message_info_t info       = infos[msg.msgid];
+                static const mavlink_message_info_t infos[256] =
+                    MAVLINK_MESSAGE_INFO;
+                mavlink_message_info_t info = infos[msg.msgid];
 
                 QMap<QString, Field> fields;
                 for (unsigned int i = 0; i < info.num_fields; i++)
diff --git a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
index 0bf656bf78556a59d441666d727bf84c44cc9998..6e526e9f7431b1e475ebb8c8fd1584e30aa23e0e 100644
--- a/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
+++ b/src/shared/Modules/RefuelingVisualizer/RefuelingVisualizer.cpp
@@ -21,6 +21,7 @@
 #include <Components/FilterSelector/FilterSelector.h>
 #include <Core/MessageBroker/MessageBroker.h>
 
+#include <QDebug>
 #include <QElapsedTimer>
 
 RefuelingVisualizer::RefuelingVisualizer(QWidget* parent)
@@ -37,7 +38,7 @@ RefuelingVisualizer::RefuelingVisualizer(QWidget* parent)
             timer.start();
             onMsgReceivedGSE(message);
             long long int time = timer.elapsed();
-            printf("GSE: %lld\n", time);
+            qDebug() << "GSE" << time;
         });
 
     getCore()->getMessageBroker()->subscribe(
@@ -48,16 +49,16 @@ RefuelingVisualizer::RefuelingVisualizer(QWidget* parent)
             timer.start();
             onMsgReceivedMOT(message);
             long long int time = timer.elapsed();
-            printf("MOTOR: %lld\n", time);
+            qDebug() << "MOTOR" << time;
         });
 }
 
 RefuelingVisualizer::~RefuelingVisualizer()
 {
     getCore()->getMessageBroker()->unsubscribe(Filter::fromString("Mav/GSE_TM"),
-                                             this);
-    getCore()->getMessageBroker()->unsubscribe(Filter::fromString("Mav/MOTOR_TM"),
-                                             this);
+                                               this);
+    getCore()->getMessageBroker()->unsubscribe(
+        Filter::fromString("Mav/MOTOR_TM"), this);
 }
 
 QWidget* RefuelingVisualizer::toWidget() { return this; }
@@ -417,7 +418,7 @@ void RefuelingVisualizer::backgroundTabs(Message msg)
             "border-image:url(../skywardhub/src/shared/Modules/"
             "RefuelingVisualizer/" +
             actualValveVec + ".png);border:0px;";
-        background->setStyleSheet(newStyle);   
+        background->setStyleSheet(newStyle);
     }
 
     if (fillingValve != labelStatus[0])