diff --git a/.idea/libraries/Maven__org_vesalainen_gpx_GPX11_1_0_2.xml b/.idea/libraries/Maven__org_vesalainen_gpx_GPX11_1_0_2.xml
new file mode 100644
index 0000000..76a983e
--- /dev/null
+++ b/.idea/libraries/Maven__org_vesalainen_gpx_GPX11_1_0_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.vesalainen.gpx:GPX11:1.0.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/vesalainen/gpx/GPX11/1.0.2/GPX11-1.0.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/vesalainen/gpx/GPX11/1.0.2/GPX11-1.0.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/vesalainen/gpx/GPX11/1.0.2/GPX11-1.0.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/src/main/java/es/kauron/estraba/App.java b/src/main/java/es/kauron/estraba/App.java
index 2e2a2f1..4b1c062 100644
--- a/src/main/java/es/kauron/estraba/App.java
+++ b/src/main/java/es/kauron/estraba/App.java
@@ -50,7 +50,7 @@ public class App extends Application {
     @Override
     public void start(Stage stage) throws Exception {
         FXMLLoader loader = new FXMLLoader(
-                App.class.getResource("fxml/App.fxml"), GENERAL_BUNDLE);
+                App.class.getResource("fxml/Dashboard.fxml"), GENERAL_BUNDLE);
         Parent root = loader.load();
         stage.getIcons().add(new Image(App.class.getResource("img/icon.png").toString()));
         stage.setTitle("ESTRABA");
diff --git a/src/main/java/es/kauron/estraba/controller/DashboardController.java b/src/main/java/es/kauron/estraba/controller/DashboardController.java
index b96e2ec..91c0473 100644
--- a/src/main/java/es/kauron/estraba/controller/DashboardController.java
+++ b/src/main/java/es/kauron/estraba/controller/DashboardController.java
@@ -1,11 +1,17 @@
 package es.kauron.estraba.controller;
+
+import com.jfoenix.controls.JFXButton;
 import com.jfoenix.controls.JFXListView;
+import com.jfoenix.controls.JFXTabPane;
 import com.lynden.gmapsfx.GoogleMapView;
+import es.kauron.estraba.App;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
 import javafx.scene.chart.AreaChart;
 import javafx.scene.chart.LineChart;
 import javafx.scene.control.Tab;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
 
 import java.net.URL;
 import java.util.ResourceBundle;
@@ -17,6 +23,9 @@ import java.util.ResourceBundle;
 
 public class DashboardController implements Initializable {
 
+    @FXML
+    private JFXTabPane root;
+
     @FXML
     private Tab tabDashboard;
 
@@ -29,26 +38,42 @@ public class DashboardController implements Initializable {
     @FXML
     private JFXListView<?> mapSummary;
 
+    @FXML
+    private JFXButton elevationButton;
+
+    @FXML
+    private JFXButton speedButton;
+
+    @FXML
+    private JFXButton hrButton;
+
+    @FXML
+    private JFXButton cadenceButton;
+
     @FXML
     private Tab tabGraph;
 
     @FXML
-    private AreaChart<?, ?> elevationChart;
+    private AreaChart<Double, Double> elevationChart;
 
     @FXML
-    private LineChart<?, ?> speedChart;
+    private LineChart<Double, Double> speedChart;
 
     @FXML
-    private LineChart<?, ?> hrChart;
+    private LineChart<Double, Double> hrChart;
 
     @FXML
-    private LineChart<?, ?> cadenceChart;
+    private LineChart<Double, Double> cadenceChart;
 
     @FXML
     private Tab tabSettings;
 
     @Override
     public void initialize(URL location, ResourceBundle resources) {
+        elevationButton.setGraphic(new ImageView(new Image(App.class.getResourceAsStream("img/elevation.png"))));
+        speedButton.setGraphic(new ImageView(new Image(App.class.getResourceAsStream("img/speed.png"))));
+        hrButton.setGraphic(new ImageView(new Image(App.class.getResourceAsStream("img/hr.png"))));
+        cadenceButton.setGraphic(new ImageView(new Image(App.class.getResourceAsStream("img/cadence.png"))));
 
     }
 }
diff --git a/src/main/resources/fxml/Dashboard.fxml b/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml
similarity index 82%
rename from src/main/resources/fxml/Dashboard.fxml
rename to src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml
index 8e5a0a1..81eb5b0 100644
--- a/src/main/resources/fxml/Dashboard.fxml
+++ b/src/main/resources/es/kauron/estraba/fxml/Dashboard.fxml
@@ -12,11 +12,11 @@
 <?import javafx.scene.control.Label?>
 <?import javafx.scene.control.Tab?>
 <?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
-<?import jfxtras.scene.layout.HBox?>
-<?import jfxtras.scene.layout.VBox?>
 
-<JFXTabPane prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1">
+<JFXTabPane fx:id="root" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/8.0.76-ea" xmlns:fx="http://javafx.com/fxml/1">
    <tabs>
       <Tab fx:id="tabDashboard" text="%tab.dashboard">
          <content>
@@ -34,20 +34,20 @@
          <content>
             <VBox>
                <children>
-                  <HBox>
+                  <HBox VBox.vgrow="ALWAYS">
                      <children>
-                        <GoogleMapView fx:id="mapView" />
+                        <GoogleMapView fx:id="mapView" HBox.hgrow="ALWAYS" />
                         <JFXListView fx:id="mapSummary" minWidth="100.0" />
                      </children>
                   </HBox>
                   <HBox minHeight="128.0" prefHeight="0.0">
                      <children>
-                        <VBox prefHeight="200.0" prefWidth="100.0">
+                        <VBox prefHeight="200.0" prefWidth="100.0" HBox.hgrow="ALWAYS">
                            <children>
-                              <JFXButton minHeight="32.0" minWidth="32.0" />
-                              <JFXButton layoutX="10.0" layoutY="10.0" minHeight="32.0" minWidth="32.0" />
-                              <JFXButton layoutX="10.0" layoutY="10.0" minHeight="32.0" minWidth="32.0" />
-                              <JFXButton layoutX="10.0" layoutY="42.0" minHeight="32.0" minWidth="32.0" />
+                              <JFXButton fx:id="elevationButton" minHeight="32.0" minWidth="32.0" />
+                              <JFXButton fx:id="speedButton" layoutX="10.0" layoutY="10.0" minHeight="32.0" minWidth="32.0" />
+                              <JFXButton fx:id="hrButton" layoutX="10.0" layoutY="10.0" minHeight="32.0" minWidth="32.0" />
+                              <JFXButton fx:id="cadenceButton" layoutX="10.0" layoutY="42.0" minHeight="32.0" minWidth="32.0" />
                            </children>
                         </VBox>
                         <LineChart minHeight="100.0" prefWidth="9999.0">
diff --git a/src/main/resources/img/cadence.png b/src/main/resources/es/kauron/estraba/img/cadence.png
similarity index 100%
rename from src/main/resources/img/cadence.png
rename to src/main/resources/es/kauron/estraba/img/cadence.png
diff --git a/src/main/resources/img/climb.png b/src/main/resources/es/kauron/estraba/img/climb.png
similarity index 100%
rename from src/main/resources/img/climb.png
rename to src/main/resources/es/kauron/estraba/img/climb.png
diff --git a/src/main/resources/img/date.png b/src/main/resources/es/kauron/estraba/img/date.png
similarity index 100%
rename from src/main/resources/img/date.png
rename to src/main/resources/es/kauron/estraba/img/date.png
diff --git a/src/main/resources/img/distance.png b/src/main/resources/es/kauron/estraba/img/distance.png
similarity index 100%
rename from src/main/resources/img/distance.png
rename to src/main/resources/es/kauron/estraba/img/distance.png
diff --git a/src/main/resources/img/downclimb.png b/src/main/resources/es/kauron/estraba/img/downclimb.png
similarity index 100%
rename from src/main/resources/img/downclimb.png
rename to src/main/resources/es/kauron/estraba/img/downclimb.png
diff --git a/src/main/resources/img/elevation.png b/src/main/resources/es/kauron/estraba/img/elevation.png
similarity index 100%
rename from src/main/resources/img/elevation.png
rename to src/main/resources/es/kauron/estraba/img/elevation.png
diff --git a/src/main/resources/img/hr.png b/src/main/resources/es/kauron/estraba/img/hr.png
similarity index 100%
rename from src/main/resources/img/hr.png
rename to src/main/resources/es/kauron/estraba/img/hr.png
diff --git a/src/main/resources/img/icon.png b/src/main/resources/es/kauron/estraba/img/icon.png
similarity index 100%
rename from src/main/resources/img/icon.png
rename to src/main/resources/es/kauron/estraba/img/icon.png
diff --git a/src/main/resources/img/speed.png b/src/main/resources/es/kauron/estraba/img/speed.png
similarity index 100%
rename from src/main/resources/img/speed.png
rename to src/main/resources/es/kauron/estraba/img/speed.png
diff --git a/src/main/resources/img/speedmax.png b/src/main/resources/es/kauron/estraba/img/speedmax.png
similarity index 100%
rename from src/main/resources/img/speedmax.png
rename to src/main/resources/es/kauron/estraba/img/speedmax.png
diff --git a/src/main/resources/img/timeexercise.png b/src/main/resources/es/kauron/estraba/img/timeexercise.png
similarity index 100%
rename from src/main/resources/img/timeexercise.png
rename to src/main/resources/es/kauron/estraba/img/timeexercise.png
diff --git a/src/main/resources/img/timespan.png b/src/main/resources/es/kauron/estraba/img/timespan.png
similarity index 100%
rename from src/main/resources/img/timespan.png
rename to src/main/resources/es/kauron/estraba/img/timespan.png
diff --git a/src/main/resources/general.properties b/src/main/resources/general.properties
index e69de29..5782bdd 100644
--- a/src/main/resources/general.properties
+++ b/src/main/resources/general.properties
@@ -0,0 +1,5 @@
+label.welcome=Welcome!
+tab.dashboard=Dashboard
+tab.graph=Stats
+tab.map=Your Route
+tab.settings=Settings
\ No newline at end of file
diff --git a/src/main/resources/general_ca.properties b/src/main/resources/general_ca.properties
index e69de29..9e731ae 100644
--- a/src/main/resources/general_ca.properties
+++ b/src/main/resources/general_ca.properties
@@ -0,0 +1,5 @@
+label.welcome=¡Benvinguts!
+tab.dashboard=Sumari
+tab.graph=Estadístiques
+tab.map=La teva ruta
+tab.settings=Ajustos
\ No newline at end of file
diff --git a/src/main/resources/general_es.properties b/src/main/resources/general_es.properties
index e69de29..580a08e 100644
--- a/src/main/resources/general_es.properties
+++ b/src/main/resources/general_es.properties
@@ -0,0 +1,5 @@
+label.welcome=¡Bienvenido!
+tab.dashboard=Resúmen
+tab.graph=Estadísticas
+tab.map=Tu ruta
+tab.settings=Ajustes
\ No newline at end of file