diff --git a/src/main/java/es/kauron/estraba/controller/DashboardController.java b/src/main/java/es/kauron/estraba/controller/DashboardController.java
index df4e21c..f4adbf7 100644
--- a/src/main/java/es/kauron/estraba/controller/DashboardController.java
+++ b/src/main/java/es/kauron/estraba/controller/DashboardController.java
@@ -45,6 +45,7 @@ import javafx.scene.Scene;
 import javafx.scene.chart.AreaChart;
 import javafx.scene.chart.LineChart;
 import javafx.scene.chart.PieChart;
+import javafx.scene.chart.XYChart;
 import javafx.scene.control.Label;
 import javafx.scene.control.Tab;
 import javafx.scene.image.Image;
@@ -120,7 +121,6 @@ public class DashboardController implements Initializable, MapComponentInitializ
 
     @FXML
     private void toggleChart(MouseEvent e) {
-        System.out.println("hi");
         for (Node n : ((Node) e.getSource()).getParent().getChildrenUnmodifiable())
             n.setVisible(!n.isVisible());
     }
@@ -139,21 +139,27 @@ public class DashboardController implements Initializable, MapComponentInitializ
     }
 
     @FXML
-    private void onMapButton(ActionEvent event){
-        switch (((JFXButton)event.getSource()).getId()) {
+    private void onMapButton(ActionEvent event) {
+        XYChart.Series<Double, Double> data = elevationChart.getData().get(0);
+        switch (((JFXButton) event.getSource()).getId()) {
             case "elevationButton":
-                mapChart.setData(elevationChart.getData());
+                data = elevationChart.getData().get(0);
                 break;
             case "speedButton":
-                mapChart.setData(speedChart.getData());
+                data = speedChart.getData().get(0);
                 break;
             case "hrButton":
-                mapChart.setData(hrChart.getData());
+                data = hrChart.getData().get(0);
                 break;
             case "cadenceButton":
-                mapChart.setData(cadenceChart.getData());
+                data = cadenceChart.getData().get(0);
                 break;
         }
+
+        if (mapChart.getData().contains(data))
+            mapChart.getData().remove(data);
+        else mapChart.getData().add(data);
+
     }
 
     private String randomMotivation() {
diff --git a/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml b/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml
index 6f15eee..c050952 100644
--- a/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml
+++ b/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml
@@ -58,7 +58,7 @@
                <VBox.margin>
                   <Insets />
                </VBox.margin>
-               <VBox minHeight="360.0" minWidth="300.0" prefHeight="300.0">
+               <VBox minHeight="360.0" minWidth="300.0" prefHeight="300.0" HBox.hgrow="ALWAYS">
                   <HBox.margin>
                      <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
                   </HBox.margin>
@@ -204,9 +204,11 @@
                      </VBox>
                   </HBox>
                </VBox>
-               <PieChart fx:id="zoneChart" labelsVisible="false" legendVisible="true" minHeight="-Infinity" minWidth="-Infinity" prefHeight="300.0" prefWidth="360.0" startAngle="90">
+               <PieChart fx:id="zoneChart" labelsVisible="false" legendVisible="true" minHeight="-Infinity"
+                         minWidth="-Infinity" prefHeight="300.0" prefWidth="360.0" startAngle="90" HBox.hgrow="ALWAYS">
                </PieChart>
-               <VBox layoutX="15.0" layoutY="15.0" minHeight="360.0" minWidth="300.0" prefHeight="300.0">
+               <VBox layoutX="15.0" layoutY="15.0" minHeight="360.0" minWidth="300.0" prefHeight="300.0"
+                     HBox.hgrow="ALWAYS">
                   <HBox alignment="CENTER" layoutX="10.0" layoutY="10.0" minHeight="-Infinity" minWidth="-Infinity" prefHeight="90.0" prefWidth="200.0" HBox.hgrow="ALWAYS" VBox.vgrow="ALWAYS">
                      <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
                         <Label fx:id="valueDate" alignment="CENTER" layoutX="10.0" layoutY="97.0" maxWidth="1.7976931348623157E308">