diff --git a/README.md b/README.md
index be8a8c6b6..0b24dd728 100644
--- a/README.md
+++ b/README.md
@@ -2,29 +2,29 @@
 
 > Here is the [working version](https://mate-academy.github.io/react_pagination/)
 
-You a given a list of items and markup for the `Pagination`. Implement the 
+You a given a list of items and markup for the `Pagination`. Implement the
 `Pagination` as a stateless component to show only the items for a current page.
 
 1. The `Pagination` should be used with the next props:
-    ```jsx harmony
-    <Pagination
-      total={42} // total number of items to paginate
-      perPage={5} // number of items per page
-      currentPage={1} /* optional with 1 by default */
-      onPageChange={(page) => { ... }}
-    />
-    ```
+   ```jsx harmony
+   <Pagination
+     total={42} // total number of items to paginate
+     perPage={5} // number of items per page
+     currentPage={1} /* optional with 1 by default */
+     onPageChange={(page) => { ... }}
+   />
+   ```
 1. Keep the HTML stucture `data-cy` attributes;
 1. Show all the existing pages considering `total` and `perPage`
 1. Current page should be highlighted with `li.active`;
 1. `onPageChange` callback should be triggered only if page was changed;
 1. The `App` should listen to the `onPageChange` and save a new page;
 1. `«` and `»` links should open the prev and the next pages accordingly
-    - disable each of them if it is already the first or the last page (use `li.disabled` and `a[aria-disabled="true"]`)
+   - disable each of them if it is already the first or the last page (use `li.disabled` and `a[aria-disabled="true"]`)
 1. Show the pagination info inside `data-cy="info"` in the next format `Page 1 (items 1 - 5 of 42)`;
 1. Implement the `<select data-cy="perPageSelector">` with `3`, `5`, `10`, `20` options to change the `perPage`;
-    - show the 1st page after changing a `perPage`;
-1. (*) Use React Router to save `?page=2&perPage=7` in the URL and apply them on page load
+   - show the 1st page after changing a `perPage`;
+1. (\*) Use React Router to save `?page=2&perPage=7` in the URL and apply them on page load
 
 ## Instructions
 
@@ -32,4 +32,4 @@ You a given a list of items and markup for the `Pagination`. Implement the
 - Implement a solution following the [React task guideline](https://github.com/mate-academy/react_task-guideline#react-tasks-guideline).
 - Use the [React TypeScript cheat sheet](https://mate-academy.github.io/fe-program/js/extra/react-typescript).
 - Open one more terminal and run tests with `npm test` to ensure your solution is correct.
-- Replace `<your_account>` with your Github username in the [DEMO LINK](https://<your_account>.github.io/react_pagination/) and add it to the PR description.
+- Replace `<your_account>` with your Github username in the [DEMO LINK](https://prokopenkooleh.github.io/react_pagination/) and add it to the PR description.
diff --git a/src/App.tsx b/src/App.tsx
index 189a990c8..b2ffde732 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,17 +1,55 @@
-import React from 'react';
+/* eslint-disable import/no-extraneous-dependencies */
+import React, { useState } from 'react';
 import './App.css';
 import { getNumbers } from './utils';
+import { Pagination } from './components/paganation';
+import { useSearchParams } from 'react-router-dom';
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const items = getNumbers(1, 42).map(n => `Item ${n}`);
 
 export const App: React.FC = () => {
+  const [searchParams, setSearchParams] = useSearchParams();
+
+  const [perPage, setPerPage] = useState(() => {
+    const value = Number(searchParams.get('perPage'));
+
+    return [3, 5, 10, 20].includes(value) ? value : 5;
+  });
+
+  const [currentPage, setCurrentPage] = useState(() => {
+    const value = Number(searchParams.get('page'));
+
+    return value > 0 ? value : 1;
+  });
+
+  const handlePageChange = (page: number) => {
+    if (page !== currentPage) {
+      setCurrentPage(page);
+    }
+  };
+
+  const selectHandler = (e: React.ChangeEvent<HTMLSelectElement>) => {
+    setPerPage(Number(e.target.value));
+    setCurrentPage(1);
+  };
+
+  React.useEffect(() => {
+    const params = new URLSearchParams();
+
+    params.set('page', String(currentPage));
+    params.set('perPage', String(perPage));
+    setSearchParams(params, { replace: true });
+  }, [currentPage, perPage, setSearchParams]);
+
   return (
     <div className="container">
       <h1>Items with Pagination</h1>
 
       <p className="lead" data-cy="info">
-        Page 1 (items 1 - 5 of 42)
+        Page {currentPage} (
+        {`items ${Math.max(1, (currentPage - 1) * perPage + 1)} - ${Math.min(currentPage * perPage, items.length)} of ${items.length}`}
+        )
       </p>
 
       <div className="form-group row">
@@ -19,7 +57,10 @@ export const App: React.FC = () => {
           <select
             data-cy="perPageSelector"
             id="perPageSelector"
-            className="form-control">
+            className="form-control"
+            value={perPage}
+            onChange={selectHandler}
+          >
             <option value="3">3</option>
             <option value="5">5</option>
             <option value="10">10</option>
@@ -33,77 +74,21 @@ export const App: React.FC = () => {
       </div>
 
       {/* Move this markup to Pagination */}
-      <ul className="pagination">
-        <li className="page-item disabled">
-          <a
-            data-cy="prevLink"
-            className="page-link"
-            href="#prev"
-            aria-disabled="true">
-            «
-          </a>
-        </li>
-        <li className="page-item active">
-          <a data-cy="pageLink" className="page-link" href="#1">
-            1
-          </a>
-        </li>
-        <li className="page-item">
-          <a data-cy="pageLink" className="page-link" href="#2">
-            2
-          </a>
-        </li>
-        <li className="page-item">
-          <a data-cy="pageLink" className="page-link" href="#3">
-            3
-          </a>
-        </li>
-        <li className="page-item">
-          <a data-cy="pageLink" className="page-link" href="#4">
-            4
-          </a>
-        </li>
-        <li className="page-item">
-          <a data-cy="pageLink" className="page-link" href="#5">
-            5
-          </a>
-        </li>
-        <li className="page-item">
-          <a data-cy="pageLink" className="page-link" href="#6">
-            6
-          </a>
-        </li>
-        <li className="page-item">
-          <a data-cy="pageLink" className="page-link" href="#7">
-            7
-          </a>
-        </li>
-        <li className="page-item">
-          <a data-cy="pageLink" className="page-link" href="#8">
-            8
-          </a>
-        </li>
-        <li className="page-item">
-          <a data-cy="pageLink" className="page-link" href="#9">
-            9
-          </a>
-        </li>
-        <li className="page-item">
-          <a
-            data-cy="nextLink"
-            className="page-link"
-            href="#next"
-            aria-disabled="false">
-            »
-          </a>
-        </li>
-      </ul>
+      <Pagination
+        total={items.length}
+        perPage={perPage}
+        currentPage={currentPage}
+        onPageChange={handlePageChange}
+      />
+
       <ul>
-        <li data-cy="item">Item 1</li>
-        <li data-cy="item">Item 2</li>
-        <li data-cy="item">Item 3</li>
-        <li data-cy="item">Item 4</li>
-        <li data-cy="item">Item 5</li>
+        {items
+          .slice((currentPage - 1) * perPage, currentPage * perPage)
+          .map(item => (
+            <li key={item} data-cy="item">
+              {item}
+            </li>
+          ))}
       </ul>
     </div>
   );
diff --git a/src/components/Pagination/Pagination.tsx b/src/components/Pagination/Pagination.tsx
deleted file mode 100644
index e417a09fc..000000000
--- a/src/components/Pagination/Pagination.tsx
+++ /dev/null
@@ -1 +0,0 @@
-export const Pagination = () => {};
diff --git a/src/components/notFoundPage/index.js b/src/components/notFoundPage/index.js
new file mode 100644
index 000000000..a391d0afb
--- /dev/null
+++ b/src/components/notFoundPage/index.js
@@ -0,0 +1 @@
+export * from './notFoundPage';
diff --git a/src/components/notFoundPage/notFoundPage.tsx b/src/components/notFoundPage/notFoundPage.tsx
new file mode 100644
index 000000000..3378ecc20
--- /dev/null
+++ b/src/components/notFoundPage/notFoundPage.tsx
@@ -0,0 +1,13 @@
+/* eslint-disable import/no-extraneous-dependencies */
+import { Link } from 'react-router-dom';
+
+export const NotFoundPage = () => {
+  return (
+    <div>
+      <h1>Not Found Page</h1>
+      <Link to="/">
+        <button>Go to Home</button>
+      </Link>
+    </div>
+  );
+};
diff --git a/src/components/paganation/Pagination.tsx b/src/components/paganation/Pagination.tsx
new file mode 100644
index 000000000..88b92cd76
--- /dev/null
+++ b/src/components/paganation/Pagination.tsx
@@ -0,0 +1,77 @@
+import React from 'react';
+import cn from 'classnames';
+
+type Props = {
+  total: number;
+  perPage: number;
+  currentPage?: number;
+  onPageChange: (page: number) => void;
+};
+
+export const Pagination: React.FC<Props> = ({
+  total,
+  perPage,
+  currentPage = 1,
+  onPageChange,
+}) => {
+  const totalPages = Math.ceil(total / perPage);
+
+  const pageNumbers = Array.from({ length: totalPages }, (_, i) => i + 1);
+
+  return (
+    <ul className="pagination">
+      <li className={cn('page-item', { disabled: currentPage === 1 })}>
+        <a
+          data-cy="prevLink"
+          className="page-link"
+          href="#prev"
+          aria-disabled={currentPage === 1}
+          onClick={e => {
+            e.preventDefault();
+            if (currentPage > 1) {
+              onPageChange(currentPage - 1);
+            }
+          }}
+        >
+          «
+        </a>
+      </li>
+      {pageNumbers.map(page => (
+        <li
+          key={page}
+          className={cn('page-item', { active: page === currentPage })}
+        >
+          <a
+            data-cy="pageLink"
+            className="page-link"
+            href={`#${page}`}
+            onClick={e => {
+              e.preventDefault();
+              if (page !== currentPage) {
+                onPageChange(page);
+              }
+            }}
+          >
+            {page}
+          </a>
+        </li>
+      ))}
+      <li className={cn('page-item', { disabled: currentPage === totalPages })}>
+        <a
+          data-cy="nextLink"
+          className="page-link"
+          href="#next"
+          aria-disabled={currentPage === totalPages}
+          onClick={e => {
+            e.preventDefault();
+            if (currentPage < totalPages) {
+              onPageChange(currentPage + 1);
+            }
+          }}
+        >
+          »
+        </a>
+      </li>
+    </ul>
+  );
+};
diff --git a/src/components/Pagination/index.ts b/src/components/paganation/index.ts
similarity index 100%
rename from src/components/Pagination/index.ts
rename to src/components/paganation/index.ts
diff --git a/src/index.tsx b/src/index.tsx
index 226f3f4bd..963282e99 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -1,5 +1,15 @@
+/* eslint-disable import/no-extraneous-dependencies */
 import { createRoot } from 'react-dom/client';
 
 import { App } from './App';
+import { createBrowserRouter, RouterProvider } from 'react-router-dom';
+import { NotFoundPage } from './components/notFoundPage';
 
-createRoot(document.getElementById('root') as HTMLElement).render(<App />);
+const router = createBrowserRouter([
+  { path: '/', element: <App /> },
+  { path: '*', element: <NotFoundPage /> },
+]);
+
+createRoot(document.getElementById('root') as HTMLElement).render(
+  <RouterProvider router={router} />,
+);