diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 905e23fa8ca627247b119bd9ef7bf29ff63c6149..4e83d19a3aaf8f0d6f77c1d759a75329b4503c66 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -2,6 +2,7 @@
     package="com.example.router_app">
    <application
         android:label="router_app"
+        android:enableOnBackInvokedCallback="true"
         android:name="${applicationName}"
         android:icon="@mipmap/ic_launcher">
         <activity
diff --git a/lib/main.dart b/lib/main.dart
index 28db3abaed42d499b835732f499f9dcf320e1681..5618c02e37f67913daa1366d633cc9aada2e6fcb 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -156,7 +156,7 @@ class _HomePageState extends State<HomePage> {
     if (result != null) {
       //Match adress with Backend
       final response = await http.post(
-          Uri.parse('http://10.0.2.2:8080/addressmatching'),
+          Uri.parse('http://25.35.19.125:8080/addressmatching'),
           body: jsonEncode({"address": result}),
           headers: <String, String>{"Content-Type": "application/json"});
       _data = jsonDecode(response.body);
@@ -203,7 +203,7 @@ class _HomePageState extends State<HomePage> {
     _isLoading = true;
 
     await Future.wait<void>([
-      _getWeather(),
+      //_getWeather(),
       _getDirections(),
     ]);
 
@@ -283,7 +283,7 @@ class _HomePageState extends State<HomePage> {
 
       // Get direction data
       // No weather or days included for now
-      final response = await http.post(Uri.parse('http://10.0.2.2:8080/route'),
+      final response = await http.post(Uri.parse('http://25.35.19.125:8080/route'),
           body: jsonEncode({
             "start_node": {"lat": originlat, "lon": originlon},
             "end_node": {"lat": destlat, "lon": destlon},