diff --git a/craco.config.js b/craco.config.js
index f4477e6d2f..25f1086653 100644
--- a/craco.config.js
+++ b/craco.config.js
@@ -1,6 +1,17 @@
 const CracoAlias = require("craco-alias");
 
 module.exports = {
+  webpack: {
+    configure: (webpackConfig, { env, paths }) => {
+      const reactAppEnv = process.env.REACT_APP_ENV;
+      if (reactAppEnv === "dev" || reactAppEnv === "stage") {
+        webpackConfig.devtool = "source-map";
+      } else {
+        webpackConfig.devtool = false;
+      }
+      return webpackConfig;
+    },
+  },
   style: {
     css: {
       loaderOptions: () => ({
diff --git a/public/manifest.json b/public/manifest.json
index 62f5748add..77bc04692d 100644
--- a/public/manifest.json
+++ b/public/manifest.json
@@ -1,6 +1,6 @@
 {
-  "short_name": "React App",
-  "name": "Create React App Sample",
+  "short_name": "Common.io",
+  "name": "Common.io",
   "icons": [
     {
       "src": "favicon.ico",
@@ -38,7 +38,7 @@
       "sizes": "512x512"
     }
   ],
-  "start_url": ".",
+  "start_url": "./inbox",
   "display": "standalone",
   "theme_color": "#000000",
   "background_color": "#ffffff"
diff --git a/tsconfig.json b/tsconfig.json
index d875ebb0fd..19e07ee1b8 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "sourceMap": true,
     "target": "es5",
     "lib": ["dom", "dom.iterable", "esnext"],
     "allowJs": true,