diff --git a/frontend/app/components/ui/CountryFlag/CountryFlag.js b/frontend/app/components/ui/CountryFlag/CountryFlag.js
index 5edf8b275..632775859 100644
--- a/frontend/app/components/ui/CountryFlag/CountryFlag.js
+++ b/frontend/app/components/ui/CountryFlag/CountryFlag.js
@@ -12,14 +12,14 @@ const CountryFlag = React.memo(({ country, className, style = {}, label = false
 	return (
 		<div className="flex items-center" style={style}>
 			{knownCountry
-				?  <div className={ cn(`mr-1 flag flag-${ countryFlag }`, className, stl.default) } />
+				?  <div className={ cn(`flag flag-${ countryFlag }`, className, stl.default) } />
 				: (
 					<div className="flex items-center w-full">
 						<Icon name="flag-na" size="22" className="" />
 						<div className="ml-2 leading-none" style={{ whiteSpace: 'nowrap'}}>Unknown Country</div>
 					</div>
 			)}
-			{ knownCountry && label && <div className={ stl.label }>{ countryName }</div> }
+			{ knownCountry && label && <div className={ cn(stl.label, 'ml-1') }>{ countryName }</div> }
 		</div>
 	);
 })
diff --git a/frontend/app/components/ui/ItemMenu/ItemMenu.js b/frontend/app/components/ui/ItemMenu/ItemMenu.js
index 4b04f235c..01d66d7d1 100644
--- a/frontend/app/components/ui/ItemMenu/ItemMenu.js
+++ b/frontend/app/components/ui/ItemMenu/ItemMenu.js
@@ -61,9 +61,9 @@ export default class ItemMenu extends React.PureComponent {
             <div
               key={ text }
               onClick={ !disabled ? this.onClick(onClick) : () => {} }
+              className={disabled ? 'cursor-not-allowed' : ''}
               role="menuitem"
               tabIndex="-1"
-              className=""
             >
               <Popup
                   delay={500}
diff --git a/frontend/path-alias.js b/frontend/path-alias.js
index c32b52dc4..4dd1117e0 100644
--- a/frontend/path-alias.js
+++ b/frontend/path-alias.js
@@ -20,4 +20,4 @@ module.exports = {
   "Shared/*": path.resolve(__dirname, "app/components/shared/*"),
   "Player": path.resolve(__dirname, "app/player"),
   "Player/*": path.resolve(__dirname, "app/player/*"),
-};
\ No newline at end of file
+}; 
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
index ec32917b1..19c82f281 100644
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -15,6 +15,15 @@
     "noEmit": true,
     "jsx": "react",
     // "baseUrl": ".",
+    "paths": {
+      "Shared/*": ["./app/components/shared/*"],
+      "App/*": ["./app/*"],
+      "Components/*": ["./app/components/*"],
+      "UI/*": ["./app/components/ui/*"],
+      "UI": ["./app/components/ui"],
+      "Player/*": ["./app/player/*"],
+      "HOCs/*": ["./app/components/hocs/*"]
+    }
   },
   "include": ["app"]
-}
\ No newline at end of file
+}