diff --git a/src/App.tsx b/src/App.tsx
index 56ffc48d6..cd386837a 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -1,31 +1,47 @@
-import { HashRouter, Route } from 'react-router-dom';
+import { Navigate, Route, Routes } from 'react-router-dom';
+
 import { PeoplePage } from './components/PeoplePage';
 import { Navbar } from './components/Navbar';
 import './App.scss';
 
 export const App = () => {
   return (
-    <HashRouter>
-      <div data-cy="app">
-        <Navbar />
-        <div className="section">
-          <div className="container">
-            <Route path="#/people">
-              <div className="block">
-                <div className="box table-container">
+    <div data-cy="app">
+      <Navbar />
+
+      <main className="section">
+        <div className="container">
+          <Routes>
+            <Route path="home" element={<Navigate to="/" replace />} />
+            <Route
+              path="/"
+              element={<h1 className="title">Home Page</h1>}
+            />
+            <Route path="people">
+              <Route
+                index
+                element={(
                   <PeoplePage />
-                </div>
-              </div>
-            </Route>
-            <Route path="/">
-              <h1 className="title">Home Page</h1>
-            </Route>
-            <Route>
-              <h1 className="title">Page not found</h1>
+                )}
+              />
+              <Route
+                path=":slug"
+                element={(
+                  <PeoplePage />
+                )}
+              />
             </Route>
-          </div>
+            <Route
+              path="*"
+              element={(
+                <h1 className="title">
+                  Page not found
+                </h1>
+              )}
+            />
+          </Routes>
         </div>
-      </div>
-    </HashRouter>
+      </main>
+    </div>
   );
 };
diff --git a/src/components/Navbar.tsx b/src/components/Navbar.tsx
index 74e30faa7..bab39959b 100644
--- a/src/components/Navbar.tsx
+++ b/src/components/Navbar.tsx
@@ -1,34 +1,35 @@
-import { useState } from 'react';
-import { Link } from 'react-router-dom';
+import classNames from 'classnames';
+import { NavLink, useSearchParams } from 'react-router-dom';
+
+type Active = {
+  isActive: boolean
+};
 
 export const Navbar = () => {
-  const [activePage, setActivePage] = useState('home');
+  const [searchParams] = useSearchParams();
+
+  const linkClass = (active: Active) => classNames('navbar-item', {
+    'has-background-grey-lighter': active.isActive,
+  });
+  const peopleLink = `people?${searchParams.toString()}`;
 
   return (
-    <nav
-      data-cy="nav"
-      className="navbar is-fixed-top has-shadow"
-      role="navigation"
-      aria-label="main navigation"
-    >
+    <nav data-cy="nav">
       <div className="container">
         <div className="navbar-brand">
-          <Link
-            className={`navbar-item ${activePage === 'home' ? 'has-background-grey-lighter' : ''}`}
-            to="#/"
-            onClick={() => setActivePage('home')}
+          <NavLink
+            to="/"
+            className={linkClass}
           >
             Home
-          </Link>
+          </NavLink>
 
-          <Link
-            aria-current="page"
-            className={`navbar-item ${activePage === 'people' ? 'has-background-grey-lighter' : ''}`}
-            to="#/people"
-            onClick={() => setActivePage('people')}
+          <NavLink
+            to={peopleLink}
+            className={linkClass}
           >
             People
-          </Link>
+          </NavLink>
         </div>
       </div>
     </nav>
diff --git a/src/components/PeopleFilters.tsx b/src/components/PeopleFilters.tsx
index 7a8ceb5ae..b0ba079b3 100644
--- a/src/components/PeopleFilters.tsx
+++ b/src/components/PeopleFilters.tsx
@@ -1,97 +1,83 @@
-/* eslint-disable max-len */
-import React, { useState } from 'react';
-import { Person } from '../types';
-
-interface Props {
-  people: Person[];
-  setVisiblePeople: (visiblePeople: Person[]) => void;
-  visiblePeople: Person[];
-}
-
-export const PeopleFilters: React.FC<Props>
-= ({ people, setVisiblePeople, visiblePeople }) => {
-  // const [sexFilter, setSexFilter] = useState('All');
-  // const [ceuntryFilter, setCeuntryFilter] = useState('All');
-  const [value, setValue] = useState('');
-
-  const handleSearch: React.ChangeEventHandler<HTMLInputElement> = (event) => {
-    const inputValue = event.target.value.toLowerCase();
-
-    setValue(inputValue);
-    // eslint-disable-next-line max-len
-    setVisiblePeople(people.filter((p) => p.name.toLowerCase().includes(inputValue)));
+import { useSearchParams } from 'react-router-dom';
+import classNames from 'classnames';
+import { SearchLink } from './SearchLink';
+
+export const PeopleFilters = () => {
+  const [searchParams, setSearchParams] = useSearchParams();
+  const allCenturies = searchParams.getAll('centuries');
+  const sex = searchParams.get('sex');
+  const setSexFilterActiveClass = (selectedSex: string) => {
+    return classNames(
+      {
+        'is-active':
+          sex === selectedSex || (selectedSex === 'all' && sex === null),
+      },
+    );
   };
 
-  const handleSexFilterClick = (filter: string) => {
-    if (filter === 'M') {
-      setVisiblePeople(visiblePeople.filter((p) => p.sex === 'm'));
-    } else if (filter === 'F') {
-      setVisiblePeople(visiblePeople.filter((p) => p.sex === 'f'));
-    } else {
-      setVisiblePeople(people);
-    }
+  const setSearchCenturyClass = (centuryValue: string) => {
+    return classNames('button', 'mr-1', {
+      'is-info': allCenturies.includes(centuryValue),
+    });
   };
 
-  const handleCeuntryFilter = (ceuntry: string) => {
-    if (ceuntry === '16') {
-      setVisiblePeople(visiblePeople.filter((p) => p.born >= 1500 && p.born < 1600));
-    } else if (ceuntry === '17') {
-      setVisiblePeople(visiblePeople.filter((p) => p.born >= 1600 && p.born < 1700));
-    } else if (ceuntry === '18') {
-      setVisiblePeople(visiblePeople.filter((p) => p.born >= 1700 && p.born < 1800));
-    } else if (ceuntry === '19') {
-      setVisiblePeople(visiblePeople.filter((p) => p.born >= 1800 && p.born < 1900));
-    } else if (ceuntry === '20') {
-      setVisiblePeople(visiblePeople.filter((p) => p.born >= 1900 && p.born < 2000));
+  const centuriesAllClasses = classNames('button', 'is-success', {
+    'is-outlined': allCenturies.length > 0,
+  });
+
+  const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
+    const newQuery = event.target.value;
+
+    if (newQuery === '') {
+      searchParams.delete('query');
     } else {
-      setVisiblePeople(people);
+      searchParams.set('query', newQuery);
     }
+
+    setSearchParams(searchParams);
   };
 
-  const handleResetAllFilters = () => {
-    // setCeuntryFilter('All');
-    // setSexFilter('All');
-    setValue('');
-    setVisiblePeople(people);
+  const setCenturyValues = (clickedCentury: string) => {
+    if (allCenturies.includes(clickedCentury)) {
+      return allCenturies.filter(century => century !== clickedCentury);
+    }
+
+    return [...allCenturies, clickedCentury];
   };
 
   return (
     <nav className="panel">
       <p className="panel-heading">Filters</p>
-
       <p className="panel-tabs" data-cy="SexFilter">
-        <a
-          className="is-active"
-          href="#/people"
-          onClick={handleSexFilterClick('All')}
+        <SearchLink
+          className={setSexFilterActiveClass('all')}
+          params={{ sex: null }}
         >
           All
-        </a>
-        <a
-          className=""
-          href="#/people?sex=m"
-          onClick={handleSexFilterClick('M')}
+        </SearchLink>
+        <SearchLink
+          className={setSexFilterActiveClass('m')}
+          params={{ sex: 'm' }}
         >
           Male
-        </a>
-        <a
-          className=""
-          href="#/people?sex=f"
-          onClick={handleSexFilterClick('F')}
+        </SearchLink>
+        <SearchLink
+          className={setSexFilterActiveClass('f')}
+          params={{ sex: 'f' }}
         >
           Female
-        </a>
+        </SearchLink>
       </p>
 
       <div className="panel-block">
         <p className="control has-icons-left">
           <input
             data-cy="NameFilter"
-            type="search"
+            type="text"
             className="input"
-            value={value}
-            onChange={handleSearch}
             placeholder="Search"
+            onChange={handleChange}
+            value={searchParams.get('query') || ''}
           />
 
           <span className="icon is-left">
@@ -103,73 +89,69 @@ export const PeopleFilters: React.FC<Props>
       <div className="panel-block">
         <div className="level is-flex-grow-1 is-mobile" data-cy="CenturyFilter">
           <div className="level-left">
-            <a
+            <SearchLink
               data-cy="century"
-              className="button mr-1"
-              href="#/people?centuries=16"
-              onClick={handleCeuntryFilter('16')}
+              className={setSearchCenturyClass('16')}
+              params={{ centuries: setCenturyValues('16') }}
             >
               16
-            </a>
+            </SearchLink>
 
-            <a
+            <SearchLink
               data-cy="century"
-              className="button mr-1 is-info"
-              href="#/people?centuries=17"
-              onClick={handleCeuntryFilter('17')}
+              className={setSearchCenturyClass('17')}
+              params={{ centuries: setCenturyValues('17') }}
             >
               17
-            </a>
+            </SearchLink>
 
-            <a
+            <SearchLink
               data-cy="century"
-              className="button mr-1 is-info"
-              href="#/people?centuries=18"
-              onClick={handleCeuntryFilter('18')}
+              className={setSearchCenturyClass('18')}
+              params={{ centuries: setCenturyValues('18') }}
             >
               18
-            </a>
+            </SearchLink>
 
-            <a
+            <SearchLink
               data-cy="century"
-              className="button mr-1 is-info"
-              href="#/people?centuries=19"
-              onClick={handleCeuntryFilter('19')}
+              className={setSearchCenturyClass('19')}
+              params={{ centuries: setCenturyValues('19') }}
             >
               19
-            </a>
+            </SearchLink>
 
-            <a
+            <SearchLink
               data-cy="century"
-              className="button mr-1"
-              href="#/people?centuries=20"
-              onClick={handleCeuntryFilter('20')}
+              className={setSearchCenturyClass('20')}
+              params={{ centuries: setCenturyValues('20') }}
             >
               20
-            </a>
+            </SearchLink>
           </div>
 
           <div className="level-right ml-4">
-            <a
+            <SearchLink
               data-cy="centuryALL"
-              className="button is-success is-outlined"
-              href="#/people"
-              onClick={handleCeuntryFilter('All')}
+              className={centuriesAllClasses}
+              params={{ centuries: null }}
             >
               All
-            </a>
+            </SearchLink>
           </div>
         </div>
       </div>
-
       <div className="panel-block">
-        <a
+        <SearchLink
           className="button is-link is-outlined is-fullwidth"
-          href="#/people"
-          onClick={handleResetAllFilters}
+          params={{
+            centuries: null,
+            sex: null,
+            query: null,
+          }}
         >
           Reset all filters
-        </a>
+        </SearchLink>
       </div>
     </nav>
   );
diff --git a/src/components/PeoplePage.tsx b/src/components/PeoplePage.tsx
index c876dbacf..a42961caa 100644
--- a/src/components/PeoplePage.tsx
+++ b/src/components/PeoplePage.tsx
@@ -1,27 +1,21 @@
-import React, { useEffect, useState } from 'react';
-// import { PeopleFilters } from './PeopleFilters';
+import { useEffect, useState } from 'react';
+
+import { PeopleFilters } from './PeopleFilters';
 import { Loader } from './Loader';
 import { PeopleTable } from './PeopleTable';
-import { Person } from '../types';
+import { Person } from '../types/Person';
 import { getPeople } from '../api';
 
-export const PeoplePage: React.FC = () => {
-  const [people, setPeople] = useState<Person[]>([]);
-  const [error, setError] = useState<string | null>(null);
-  const [visiblePeople, setVisiblePeople] = useState<Person[]>([]);
+export const PeoplePage = () => {
+  const [people, setPeople] = useState<Person[] | null>(null);
+  const [isError, setIsError] = useState(false);
+  const showLoader = people === null && !isError;
+  const peopleLoaded = !!people?.length;
 
   useEffect(() => {
     getPeople()
-      .then((data) => {
-        setPeople(data);
-        if (data.length === 0) {
-          setError('There are no people on the server');
-          setVisiblePeople([]);
-        }
-      })
-      .catch(() => {
-        setError('Something went wrong while fetching data');
-      });
+      .then(setPeople)
+      .catch(() => setIsError(true));
   }, []);
 
   return (
@@ -30,32 +24,30 @@ export const PeoplePage: React.FC = () => {
 
       <div className="block">
         <div className="columns is-desktop is-flex-direction-row-reverse">
-          <div className="column is-7-tablet is-narrow-desktop">
-            {/* <PeopleFilters
-              people={people}
-              setVisiblePeople={setVisiblePeople}
-              visiblePeople={visiblePeople}
-            /> */}
-          </div>
+          {peopleLoaded && (
+            <div className="column is-7-tablet is-narrow-desktop">
+              <PeopleFilters />
+            </div>
+          )}
 
           <div className="column">
             <div className="box table-container">
-              {error ? (
-                <p data-cy="peopleLoadingError">{error}</p>
-              ) : (
-                <>
-                  <Loader />
-                  {visiblePeople.length === 0 ? (
-                    <p>
-                      There are no people matching the current search criteria
-                    </p>
-                  ) : (
-                    <PeopleTable
-                      visiblePeople={visiblePeople}
-                      people={people}
-                    />
-                  )}
-                </>
+              {showLoader && <Loader />}
+
+              {isError && (
+                <p data-cy="peopleLoadingError">Something went wrong</p>
+              )}
+
+              {people && !people.length && (
+                <p data-cy="noPeopleMessage">
+                  There are no people on the server
+                </p>
+              )}
+
+              {peopleLoaded && (
+                <PeopleTable
+                  people={people}
+                />
               )}
             </div>
           </div>
diff --git a/src/components/PeopleTable.tsx b/src/components/PeopleTable.tsx
index 73cdcdf71..d41f639af 100644
--- a/src/components/PeopleTable.tsx
+++ b/src/components/PeopleTable.tsx
@@ -1,87 +1,215 @@
+/* eslint-disable max-len */
 import React from 'react';
-import { Person } from '../types';
+import { Link, useParams, useSearchParams } from 'react-router-dom';
+import classNames from 'classnames';
+import { Person } from '../types/Person';
+import { SearchLink } from './SearchLink';
 
 interface Props {
-  visiblePeople: Person[];
   people: Person[];
 }
 
-export const PeopleTable: React.FC<Props> = ({ visiblePeople, people }) => {
-  const getPersonLink = (name: string) => {
-    const person = people.find((p) => p.name === name);
+export const PeopleTable: React.FC<Props> = ({ people }) => {
+  const [searchParams] = useSearchParams();
+  const { slug: selectedPersonSlug } = useParams();
+  const query = searchParams.get('query')?.toLowerCase() || '';
+  const centuries = searchParams.getAll('centuries');
+  const sex = searchParams.get('sex');
+  const sort = searchParams.get('sort');
+  const order = searchParams.get('order');
 
-    return person ? <a href={`#/people/${person.slug}`}>{name}</a> : name;
+  let displayedPeople: Person[] = [...people];
+
+  if (query) {
+    displayedPeople = displayedPeople.filter((person) => {
+      const personName = person.name.toLowerCase();
+      const motherName = person.motherName?.toLowerCase() || '';
+      const fatherName = person.fatherName?.toLowerCase() || '';
+      // eslint-disable-next-line max-len
+      const personMatch = personName.includes(query) || motherName.includes(query) || fatherName.includes(query);
+
+      return personMatch;
+    });
+  }
+
+  if (centuries.length > 0 && centuries[0] !== 'any') {
+    // eslint-disable-next-line max-len
+    displayedPeople = displayedPeople.filter((p) => centuries.includes((Math.floor(p.born / 100) + 1).toString()));
+  }
+
+  if (sex) {
+    displayedPeople = displayedPeople.filter((p) => p.sex === sex);
+  }
+
+  displayedPeople.sort((p1, p2) => {
+    let [person1, person2] = [p1, p2];
+
+    if (order === 'desc') {
+      [person2, person1] = [person1, person2];
+    }
+
+    switch (sort) {
+      case 'name':
+      case 'sex':
+        return person1[sort].localeCompare(person2[sort]);
+
+      case 'died':
+      case 'born':
+        return person1[sort] - person2[sort];
+
+      default:
+        return 0;
+    }
+  });
+
+  const setSortColumnClasses = (sortBy: string) => {
+    return classNames('fas', {
+      'fa-sort': sort !== sortBy,
+    }, {
+      'fa-sort-down': sort === sortBy && order === 'desc',
+    }, {
+      'fa-sort-up': sort === sortBy && order === 'asc',
+    });
+  };
+
+  const setSortParam = (sortParameter: string) => {
+    if (!sort || sort !== sortParameter) {
+      return { sort: sortParameter, order: null };
+    }
+
+    switch (order) {
+      case 'desc':
+        return { sort: null, order: null };
+
+      default:
+        return { order: 'desc' };
+    }
   };
 
   return (
-    <table
-      data-cy="peopleTable"
-      className="table is-striped is-hoverable is-narrow is-fullwidth"
-    >
-      <thead>
-        <tr>
-          <th>
-            <span className="is-flex is-flex-wrap-nowrap">
-              Name
-              <a href="#/people?sort=name">
-                <span className="icon">
-                  <i className="fas fa-sort" />
+    <>
+      {!displayedPeople.length ? (
+        <p>There are no people matching the current search criteria</p>
+      ) : (
+        <table
+          data-cy="peopleTable"
+          className="table is-striped is-hoverable is-narrow is-fullwidth"
+        >
+          <thead>
+            <tr>
+              <th>
+                <span className="is-flex is-flex-wrap-nowrap">
+                  Name
+                  <SearchLink
+                    className="is-active"
+                    params={setSortParam('name') as Record<string, string | null>}
+                  >
+                    <span className="icon">
+                      <i className={setSortColumnClasses('name')} />
+                    </span>
+                  </SearchLink>
                 </span>
-              </a>
-            </span>
-          </th>
-
-          <th>
-            <span className="is-flex is-flex-wrap-nowrap">
-              Sex
-              <a href="#/people?sort=sex">
-                <span className="icon">
-                  <i className="fas fa-sort" />
+              </th>
+              <th>
+                <span className="is-flex is-flex-wrap-nowrap">
+                  Sex
+                  <SearchLink
+                    className="is-active"
+                    params={setSortParam('sex') as Record<string, string | null>}
+                  >
+                    <span className="icon">
+                      <i className={setSortColumnClasses('sex')} />
+                    </span>
+                  </SearchLink>
                 </span>
-              </a>
-            </span>
-          </th>
-
-          <th>
-            <span className="is-flex is-flex-wrap-nowrap">
-              Born
-              <a href="#/people?sort=born&amp;order=desc">
-                <span className="icon">
-                  <i className="fas fa-sort-up" />
+              </th>
+              <th>
+                <span className="is-flex is-flex-wrap-nowrap">
+                  Born
+                  <SearchLink
+                    className="is-active"
+                    params={setSortParam('born') as Record<string, string | null>}
+                  >
+                    <span className="icon">
+                      <i className={setSortColumnClasses('born')} />
+                    </span>
+                  </SearchLink>
                 </span>
-              </a>
-            </span>
-          </th>
-
-          <th>
-            <span className="is-flex is-flex-wrap-nowrap">
-              Died
-              <a href="#/people?sort=died">
-                <span className="icon">
-                  <i className="fas fa-sort" />
+              </th>
+              <th>
+                <span className="is-flex is-flex-wrap-nowrap">
+                  Died
+                  <SearchLink
+                    className="is-active"
+                    params={setSortParam('died') as Record<string, string | null>}
+                  >
+                    <span className="icon">
+                      <i className={setSortColumnClasses('died')} />
+                    </span>
+                  </SearchLink>
                 </span>
-              </a>
-            </span>
-          </th>
-          <th>Mother</th>
-          <th>Father</th>
-        </tr>
-      </thead>
-
-      <tbody>
-        {visiblePeople.map((p) => (
-          <tr data-cy="person" key={p.slug}>
-            <td>
-              <a href={`#/people/${p.slug}`}>{p.name}</a>
-            </td>
-            <td>{p.sex}</td>
-            <td>{p.born}</td>
-            <td>{p.died}</td>
-            <td>{p.mother ? getPersonLink(p.mother.name) : '-'}</td>
-            <td>{p.father ? getPersonLink(p.father.name) : '-'}</td>
-          </tr>
-        ))}
-      </tbody>
-    </table>
+              </th>
+              <th>Mother</th>
+              <th>Father</th>
+            </tr>
+          </thead>
+
+          <tbody>
+            {displayedPeople.map((person) => (
+              <tr
+                data-cy="person"
+                key={person.slug}
+                className={selectedPersonSlug === person.slug ? 'has-background-warning' : ''}
+              >
+                <td>
+                  <Link
+                    to={`/people/${person.slug}/?sort=${sort}`}
+                    className={person.sex === 'f' ? 'has-text-danger' : ''}
+                  >
+                    {person.name}
+                  </Link>
+                </td>
+                <td>{person.sex}</td>
+                <td>{person.born}</td>
+                <td>{person.died}</td>
+
+                {/* <td>
+                  {person.mother
+                    ? (
+                      <Link
+                        to={`/people/${person.motherName}/?sort=${sort}`}
+                        className={person.sex === 'f' ? 'has-text-danger' : ''}
+                      >
+                        {person.mother.name}
+                      </Link>
+                    ) : '-'}
+                </td> */}
+                <td>
+                  {person.motherName && people.some(p => p.name === person.motherName)
+                    ? (
+                      <Link
+                        to={`/people/${person.mother?.slug}/?sort=${sort}`}
+                        className="has-text-danger"
+                      >
+                        {person.motherName}
+                      </Link>
+                    ) : person.motherName || '-'}
+                </td>
+                <td>
+                  {person.fatherName && people.some(p => p.name === person.fatherName)
+                    ? (
+                      <Link
+                        to={`/people/${person.father?.slug}/?sort=${sort}`}
+                      >
+                        {person.fatherName}
+                      </Link>
+                    ) : person.fatherName || '-'}
+                </td>
+              </tr>
+            ))}
+          </tbody>
+        </table>
+      )}
+    </>
   );
 };