diff --git a/Changelog.md b/Changelog.md
index 6d6d8598..92ec15d8 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,15 +2,20 @@
 
 ## Unreleased
 
-* Add back buttons on every page for iOS
-* Add launcher/app icons for iOS
+* Nothing here yet
+
+## v1.6-beta
+
 * Complaint subscription added and comments notifications work
 * Move dropdown button to FAB in Mess Menu
 * Fix multiple roles (Hero animation) bug
 * Add InstiApp launcher icon on Android
 * Can edit/delete comments on a Complaint
 * App links for Android part work
+* Add back buttons on every page for iOS
+* Add launcher/app icons for iOS
 * Add Batch number on App Icon as Unread Notification Number on iOS
+* Change map url to standalone map url for smaller js file
 
 ## v1.5-beta
 
diff --git a/lib/src/routes/mappage.dart b/lib/src/routes/mappage.dart
index 4a780b6d..f18dde96 100644
--- a/lib/src/routes/mappage.dart
+++ b/lib/src/routes/mappage.dart
@@ -19,9 +19,14 @@ class _MapPageState extends State<MapPage> {
 
   jag.Jaguar server;
 
-  final String hostUrl = "127.0.0.1:9999";
+  // final String hostUrl = "insti.app";
   // final String mapUrl = "https://insti.app/map/?sandbox=true";
-  final String mapUrl = "http://127.0.0.1:9999/";
+
+  // final String hostUrl = "127.0.0.1:9999";
+  // final String mapUrl = "http://127.0.0.1:9999/";
+
+  final String hostUrl = "pulsejet.github.io";
+  final String mapUrl = "https://pulsejet.github.io/instimapweb-standalone/";
 
   StreamSubscription<String> onUrlChangedSub;
   StreamSubscription<WebViewStateChanged> onStateChangedSub;
@@ -32,10 +37,11 @@ class _MapPageState extends State<MapPage> {
   @override
   void initState() {
     super.initState();
-    startMapServerIfNotStarted().then((_) {
-      flutterWebviewPlugin.reloadUrl(mapUrl);
-      flutterWebviewPlugin.hide();
-    });
+
+    // startMapServerIfNotStarted().then((_) {
+    //   flutterWebviewPlugin.reloadUrl(mapUrl);
+    //   flutterWebviewPlugin.hide();
+    // });
 
     onUrlChangedSub = flutterWebviewPlugin.onUrlChanged.listen((String url) {
       print("Changed URL: $url");
@@ -114,6 +120,7 @@ class _MapPageState extends State<MapPage> {
       return server.serve();
     } catch (e) {
       // Already server running
+      return Future.delayed(Duration.zero);
     }
   }
 }
diff --git a/pubspec.yaml b/pubspec.yaml
index ec2e53f6..ec0153d9 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,7 +7,7 @@ description: Flutter App for Indian Institute of Technology, Bombay
 # Both the version and the builder number may be overridden in flutter
 # build by specifying --build-name and --build-number, respectively.
 # Read more about versioning at semver.org.
-version: 1.5+22
+version: 1.6.0
 
 environment:
   sdk: ">=2.0.0-dev.68.0 <3.0.0"