diff --git a/ui/v2.5/.eslintrc.json b/ui/v2.5/.eslintrc.json
index ca9002de9..650b76ff5 100644
--- a/ui/v2.5/.eslintrc.json
+++ b/ui/v2.5/.eslintrc.json
@@ -8,6 +8,7 @@
   ],
   "extends": [
       "airbnb-typescript",
+      "airbnb/hooks",
       "prettier",
       "prettier/react",
       "prettier/@typescript-eslint"
diff --git a/ui/v2.5/config/webpack.dev.js b/ui/v2.5/config/webpack.dev.js
index 030cd8153..426f19cdd 100644
--- a/ui/v2.5/config/webpack.dev.js
+++ b/ui/v2.5/config/webpack.dev.js
@@ -31,6 +31,8 @@ module.exports = merge(commonConfig, {
     compress: true,
     host: '0.0.0.0',
     hot: true, // enable HMR on the server host: '0.0.0.0',
+    transportMode: 'ws',
+    injectClient: false,
     port: process.env.PORT,
     historyApiFallback: true,
     stats: {
diff --git a/ui/v2.5/package.json b/ui/v2.5/package.json
index 0a1f9c222..d629a88fa 100644
--- a/ui/v2.5/package.json
+++ b/ui/v2.5/package.json
@@ -12,7 +12,7 @@
     "lint": "yarn lint:css && yarn lint:js",
     "lint:js": "eslint --cache src/**/*.{ts,tsx}",
     "lint:css": "stylelint 'src/**/*.scss'",
-    "format": "prettier \"src/**/*.{js,jsx,ts,tsx}\"",
+    "format": "prettier --write \"src/**/*.{js,jsx,ts,tsx}\"",
     "gqlgen": "gql-gen --config codegen.yml"
   },
   "browserslist": [
diff --git a/ui/v2.5/src/index.scss b/ui/v2.5/src/index.scss
index 35ad43e43..4ced94b47 100755
--- a/ui/v2.5/src/index.scss
+++ b/ui/v2.5/src/index.scss
@@ -6,6 +6,8 @@
 @import "styles/scrollbars";
 @import "styles/variables";
 
+@import "./components/**/*.scss";
+
 body {
   margin: 0;
   padding: $pt-navbar-height 0 0 0;