diff --git a/web-app/src/App.vue b/web-app/src/App.vue
index 2b70f69..4ccb4fc 100644
--- a/web-app/src/App.vue
+++ b/web-app/src/App.vue
@@ -9,24 +9,12 @@
     <div class="main-content">
       <!-- Left Sidebar with Controls -->
       <div class="sidebar">
-        <ControlPanel
-          :show-temperature.sync="showTemperature"
-          :show-humidity.sync="showHumidity"
-          @add-temperature="addTemperature"
-          @refresh="refreshData"
-          :manager="manager"
-        />
+        <ControlPanel :manager="manager" />
       </div>
 
       <!-- Right Side Chart Area -->
       <div class="chart-area">
-        <ChartComponent
-          :series="series"
-          :show-temperature="showTemperature"
-          :show-humidity="showHumidity"
-          :loading="loading"
-          :error="error"
-        />
+        <ChartComponent :manager="manager" />
       </div>
     </div>
   </div>
@@ -38,7 +26,7 @@ import ChartComponent from "./components/ChartComponent.vue";
 import ControlPanel from "./components/ControlPanel.vue";
 import { HttpClient } from "./Services/HttpClient";
 import { TimeSeriesManager } from "./Measures/TimeSeriesManager";
-import { URL, USERNAME, PASSWORD, USER, ROOM, DEVICE, APP_NAME } from "./const";
+import { URL, USERNAME, PASSWORD, APP_NAME } from "./const";
 import { Serie } from "./Measures/Serie";
 
 let httpClient = new HttpClient(URL, USERNAME, PASSWORD);
@@ -53,53 +41,8 @@ export default defineComponent({
   data() {
     return {
       manager,
-      series: [] as any[],
-      loading: true,
-      error: undefined as string | undefined,
-      showTemperature: true,
-      showHumidity: true,
     };
   },
-  methods: {
-    addTemperature() {
-      // Implement your functionality here
-      console.log("Add temperature clicked");
-      manager
-        .getNewValue(USER, ROOM, DEVICE)
-        .then((result) => {})
-        .catch((error) => {
-          console.error("Error asking data:", error);
-          this.error = "Failed to load data. Please try again later.";
-          this.loading = false;
-        });
-    },
-
-    refreshData() {
-      console.log("Refreshing data...");
-      this.fetchData();
-    },
-
-    fetchData() {
-      this.loading = true;
-      this.error = undefined;
-
-      manager
-        .getTimeSeriesData(USER, ROOM, DEVICE)
-        .then((result) => {
-          this.series = result;
-          this.loading = false;
-        })
-        .catch((error) => {
-          console.error("Error fetching data:", error);
-          this.error = "Failed to load data. Please try again later.";
-          this.loading = false;
-        });
-    },
-  },
-  mounted() {
-    // Fetch data when component is mounted
-    this.fetchData();
-  },
 });
 </script>
 
diff --git a/web-app/src/Measures/TimeSeriesManager.ts b/web-app/src/Measures/TimeSeriesManager.ts
index f5533b7..532f585 100644
--- a/web-app/src/Measures/TimeSeriesManager.ts
+++ b/web-app/src/Measures/TimeSeriesManager.ts
@@ -57,16 +57,17 @@ export class TimeSeriesManager {
     },
   ];
 
+  error = ref(false);
+  loading = ref("");
+
+  series = ref<Serie[]>([]);
+
   constructor(client: HttpClient) {
     this.client = client;
   }
 
-  async getTimeSeriesData(
-    user: string,
-    room: string,
-    device: string
-  ): Promise<Serie[]> {
-    return this.client
+  async getTimeSeriesData() {
+    this.client
       .getValues(
         this.selected_user.tag,
         this.selected_room.tag,
@@ -112,20 +113,20 @@ export class TimeSeriesManager {
         const temperatureSerie = new Serie(
           TEMPERATURE,
           temperatureRecordsProcessed,
-          user,
-          room,
-          device
+          this.selected_user.user,
+          this.selected_room.room,
+          this.selected_device.device
         );
 
         const humiditySerie = new Serie(
           HUMIDITY,
           humidityRecordProcessed,
-          user,
-          room,
-          device
+          this.selected_user.user,
+          this.selected_room.room,
+          this.selected_device.device
         );
 
-        return [temperatureSerie, humiditySerie];
+        this.series.value = [temperatureSerie, humiditySerie];
       })
       .catch((error) => {
         console.error("Error fetching time series data:", error);
@@ -133,10 +134,16 @@ export class TimeSeriesManager {
       });
   }
 
-  async getNewValue(user: string, room: string, device: string) {
-    this.client.newValue(user, room, device).catch((error) => {
-      console.error("Error asking new values:", error);
-      throw error;
-    });
+  async getNewValue() {
+    this.client
+      .newValue(
+        this.selected_user.user,
+        this.selected_room.room,
+        this.selected_device.device
+      )
+      .catch((error) => {
+        console.error("Error asking new values:", this.selected_device.device);
+        throw error;
+      });
   }
 }
diff --git a/web-app/src/components/ChartComponent.vue b/web-app/src/components/ChartComponent.vue
index a2475ee..ae00c55 100644
--- a/web-app/src/components/ChartComponent.vue
+++ b/web-app/src/components/ChartComponent.vue
@@ -1,8 +1,8 @@
 <!-- src/components/ChartComponent.vue -->
 <template>
   <div class="chart-wrapper">
-    <div v-if="loading" class="loading-state">Loading data...</div>
-    <div v-else-if="error" class="error-state">{{ error }}</div>
+    <div v-if="manager.loading" class="loading-state">Loading data...</div>
+    <div v-else-if="manager.error" class="error-state">{{ manager.error }}</div>
     <div v-else class="chart-container">
       <Scatter
         v-if="chartData.datasets.length > 0"
@@ -26,6 +26,7 @@ import {
 } from "chart.js";
 import { Scatter } from "vue-chartjs";
 import { Serie } from "../Measures/Serie";
+import { TimeSeriesManager } from "../Measures/TimeSeriesManager";
 
 // Register Chart.js components
 ChartJS.register(LinearScale, PointElement, LineElement, Tooltip, Legend);
@@ -40,32 +41,31 @@ export default defineComponent({
       type: Array as PropType<Serie[]>, // Use PropType to specify array of Serie
       default: () => [],
     },
-    showTemperature: {
-      type: Boolean,
-      default: true,
-    },
-    showHumidity: {
-      type: Boolean,
-      default: true,
-    },
-    loading: {
-      type: Boolean,
-      default: false,
-    },
-    error: {
-      type: String as PropType<string | undefined>,
-      default: null,
+    manager: {
+      type: Object as PropType<TimeSeriesManager>,
+      required: true,
     },
   },
   setup(props) {
     const chartData = computed(() => {
-      let series_prepared = props.series.map((s: Serie) => {
-        return s.getSerie();
-      });
+      if (
+        props.manager ||
+        ((props.manager as TimeSeriesManager).series.value as Serie[])
+      ) {
+        let series_prepared = (props.manager.series.value as Serie[]).map(
+          (s: Serie) => {
+            return s.getSerie();
+          }
+        );
 
-      return {
-        datasets: series_prepared,
-      };
+        return {
+          datasets: series_prepared,
+        };
+      } else {
+        return {
+          datasets: [],
+        };
+      }
     });
 
     const chartOptions = {
diff --git a/web-app/src/components/ControlPanel.vue b/web-app/src/components/ControlPanel.vue
index 8ef220f..36b92ba 100644
--- a/web-app/src/components/ControlPanel.vue
+++ b/web-app/src/components/ControlPanel.vue
@@ -1,10 +1,10 @@
 <template>
   <div class="control-panel">
-    <button @click="$emit('add-temperature')" class="action-button">
+    <button @click="addTemperature" class="action-button">
       Add Temperature
     </button>
 
-    <button @click="$emit('refresh')" class="refresh-button">
+    <button @click="fetchData" class="refresh-button">
       <span class="button-icon">↻</span> Refresh Data
     </button>
   </div>
@@ -57,8 +57,6 @@ import "vue-multiselect/dist/vue-multiselect.css"; // Add
 import { ref } from "vue";
 import { TimeSeriesManager } from "@/Measures/TimeSeriesManager";
 
-let options = [{ code: "CA", country: "Canada" }];
-
 
 export default defineComponent({
   name: "ControlPanel",
@@ -74,23 +72,34 @@ export default defineComponent({
     manager: {
       type: TimeSeriesManager,
       required: true,
-    }
-
+    },
   },
-  emits: [
-    "add-temperature",
-    "update:showTemperature",
-    "update:showHumidity",
-    "refresh",
-    "simulate-data",
-  ],
   components: {
     Multiselect,
   },
   methods: {
-    setSelected(value: any) {
-      //  trigger a mutation, or dispatch an action
+    addTemperature() {
+      // Implement your functionality here
+      console.log("Add temperature clicked");
+      this.manager
+        .getNewValue()
+        .then((result) => {})
+        .catch((error) => {
+          console.error("Error asking data:", error);
+        });
     },
+    fetchData() {
+      console.log("Fetch data");
+      this.manager
+        .getTimeSeriesData()
+        .then((result) => {})
+        .catch((error) => {
+          console.error("Error fetching data:", error);
+        });
+    },
+  },
+  mounted() {
+    this.fetchData();
   },
 });
 </script>