diff --git a/src/components/App.tsx b/src/components/App.tsx
index 28a66a1..1716cd2 100644
--- a/src/components/App.tsx
+++ b/src/components/App.tsx
@@ -1,45 +1,57 @@
-import React  from 'react';
+import React from 'react';
 import classNames from 'classnames';
 import Header from './Header/Header';
 import Footer from './Footer/Footer';
 import Router from './Router';
 import {BrowserRouter, Switch, Route, Redirect, useParams, useLocation} from 'react-router-dom';
-import { Item } from '../model';
+import {Item} from '../model';
 
 const useQuery = () => {
-  return new URLSearchParams(useLocation().search);
+    return new URLSearchParams(useLocation().search);
 }
 
-const RouterWithPageParam = ({items, releases}: {items: Item[], releases: string[]}) => {
-  const { page } = useParams();
-  const query = useQuery();
+const RouterWithPageParam = ({items, releases}: { items: Item[], releases: string[] }) => {
+    const {page} = useParams();
+    const query = useQuery();
 
-  return <Router pageName={page} search={query.get('search') || ''} items={items} releases={releases}/>;
+    return <Router pageName={page} search={query.get('search') || ''} items={items} releases={releases}/>;
 };
 
-export default function App({items, releases}: {items: Item[], releases: string[]}) {
-  return (
-    <BrowserRouter>
-      <div>
-        <div className='page'>
-          <div className='page__header'>
-            <Header pageName='a' />
-          </div>
-          <div className={classNames('page__content')}>
+const HeaderWithPageParam = () => {
+    const {page} = useParams();
+
+    return <Header pageName={page}/>
+};
+
+const FooterWithPageParam = ({items}: { items: Item[]}) => {
+    const {page} = useParams();
+
+    return <Footer pageName={page} items={items}/>
+};
+
+export default function App({items, releases}: { items: Item[], releases: string[] }) {
+    return (
+        <BrowserRouter>
             <Switch>
-              <Route path={'/techradar/:page(.+).html'}>
-                <RouterWithPageParam items={items} releases={releases} />
-              </Route>
-              <Route path={'/'}>
-                <Redirect to={'/techradar/index.html'} />
-              </Route>
+                <Route path={'/techradar/:page(.+).html'}>
+                    <div>
+                        <div className='page'>
+                            <div className='page__header'>
+                                <HeaderWithPageParam/>
+                            </div>
+                            <div className={classNames('page__content')}>
+                                <RouterWithPageParam items={items} releases={releases}/>
+                            </div>
+                            <div className='page__footer'>
+                                <FooterWithPageParam items={items}/>
+                            </div>
+                        </div>
+                    </div>
+                </Route>
+                <Route path={'/'}>
+                    <Redirect to={'/techradar/index.html'}/>
+                </Route>
             </Switch>
-          </div>
-          <div className='page__footer'>
-            <Footer items={items} pageName='a' />
-          </div>
-        </div>
-      </div>
-    </BrowserRouter>
-  );
+        </BrowserRouter>
+    );
 }