diff --git a/src/App.js b/src/App.js
index 54f739d..767b4a9 100644
--- a/src/App.js
+++ b/src/App.js
@@ -15,12 +15,12 @@ import NotFound from './components/NotFound';
 function App() {
 	return (
 		<div className='App'>
-			<BrowserRouter>
+			<BrowserRouter basename={process.env.PUBLIC_URL}>
 				<ToastContainer />
 				<Navbar />
 				<Routes>
-					<Route path='/online-shop/' element={<Home />} />
-					<Route path='/online-shop/cart' element={<Cart />} />
+					<Route path='cart' element={<Cart />} />
+					<Route path='/' element={<Home />} />
 					<Route path='*' element={<NotFound />} />
 				</Routes>
 				<Footer />
diff --git a/src/components/BackHomeButton.jsx b/src/components/BackHomeButton.jsx
index 3e0415b..cc7817b 100644
--- a/src/components/BackHomeButton.jsx
+++ b/src/components/BackHomeButton.jsx
@@ -3,7 +3,7 @@ import { Link } from 'react-router-dom';
 const BackHomeButton = (props) => {
 	const { text } = props;
 	return (
-		<Link to='/online-shop/' className='back-to-home'>
+		<Link to='/' className='back-to-home'>
 			<span>
 				<svg
 					xmlns='http://www.w3.org/2000/svg'
diff --git a/src/components/GoToCartButton.jsx b/src/components/GoToCartButton.jsx
index dd498b6..d65add5 100644
--- a/src/components/GoToCartButton.jsx
+++ b/src/components/GoToCartButton.jsx
@@ -6,7 +6,7 @@ const GoToCartButton = (props) => {
 		<div>
 			{text}
 			<br />
-			<Link to='/online-shop/cart' className='go-to-cart'>
+			<Link to='/cart' className='go-to-cart'>
 				<span>Go To Cart </span>
 				<span>
 					<svg
diff --git a/src/components/Navbar.jsx b/src/components/Navbar.jsx
index dd74d3a..e222d6e 100644
--- a/src/components/Navbar.jsx
+++ b/src/components/Navbar.jsx
@@ -7,10 +7,10 @@ const Navbar = () => {
 	return (
 		<div className='navbar-background'>
 			<nav className='navbar'>
-				<Link to='/online-shop/' className='title'>
+				<Link to='/' className='title'>
 					React Online Shop
 				</Link>
-				<Link to='/online-shop/cart'>
+				<Link to='/cart'>
 					<div className='nav-bag'>
 						<svg
 							xmlns='http://www.w3.org/2000/svg'