diff --git a/src/main/java/ch/hepia/api/transport/Stop.java b/src/main/java/ch/hepia/api/transport/Stop.java
index 2107fd915c09d4ef219a36d98b500583837dee1f..b5c2193043b670bf16a5605a7a182acca89c4400 100644
--- a/src/main/java/ch/hepia/api/transport/Stop.java
+++ b/src/main/java/ch/hepia/api/transport/Stop.java
@@ -106,7 +106,7 @@ public class Stop implements Serializable {
             String[] keys = new String[10];
             datas.keySet().toArray(keys);
             String type = keys[4];
-            JSONObject locationJSON = datas.isNull("type") ? new JSONObject() : datas.getJSONObject(type);
+            JSONObject locationJSON = datas.isNull("location") ? new JSONObject() : datas.getJSONObject("location");
             Location.LocationBuilder location = new Location.LocationBuilder(locationJSON, type);
 
             DateFormat formatter = new SimpleDateFormat("kk:mm:ss");
diff --git a/src/main/java/ch/hepia/ui/MainWindowController.java b/src/main/java/ch/hepia/ui/MainWindowController.java
index 132ada79e532cf7ad5172583c32f0c963fe70d02..3567d7bfdc86c97afddcf6e9e1d541e55c7267e1 100644
--- a/src/main/java/ch/hepia/ui/MainWindowController.java
+++ b/src/main/java/ch/hepia/ui/MainWindowController.java
@@ -106,17 +106,19 @@ public class MainWindowController implements Initializable {
      * @param y Where to draw but vertically
      */
     private void drawConnection(Connection connection, int x, int y){
-		List<Section> sections = connection.getSections();
+        List<Section> sections = connection.getSections();
+        connectionCanvas.getGraphicsContext2D().setFill(Color.RED);
+        
+        System.out.println(sections.size());
 		for (int i = 0; i < sections.size(); i++){
-			connectionCanvas.getGraphicsContext2D().setFill(Color.RED);
-
 			connectionCanvas.getGraphicsContext2D().strokeLine(
-					x + (622 / sections.size()) * i, y, 622 / sections.size(), y);
-			connectionCanvas.getGraphicsContext2D().fillOval(x + (622 / sections.size()) * i - 5, y - 5,
+					x + (622 / sections.size()) * (i), y, 622 / sections.size(), y);
+			connectionCanvas.getGraphicsContext2D().fillOval(x + (622 / sections.size()) * (i) - 5, y - 5,
 					10, 10);
-
-			connectionCanvas.getGraphicsContext2D().fillText(sections.get(i).getDeparture().getLocation().getName(),
-                    x + (622 / sections.size()) * i, y - 20);
+			connectionCanvas.getGraphicsContext2D().fillText(sections.get(i).getArrival().getLocation().getName(),
+                    x + (622 / sections.size()) * (i), y - 20);
+			connectionCanvas.getGraphicsContext2D().fillText(sections.get(i).getArrival().getArrivalTime().toString(),
+                    x + (622 / sections.size()) * (i), y - 40);
 		}
     }