diff --git a/pages/_app.tsx b/pages/_app.tsx
index 4cbbf02..10e009a 100644
--- a/pages/_app.tsx
+++ b/pages/_app.tsx
@@ -1,9 +1,9 @@
 import '../styles/globals.scss';
 import type { AppProps } from 'next/app';
-import { Footer } from './layout/Footer';
-import { Header } from './layout/Header';
+import Footer from './components/Footer';
+import Header from './components/Header';
 
-function MyApp({ Component, pageProps }: AppProps) {
+function Runosaari({ Component, pageProps }: AppProps) {
   return (
     <>
       <Header />
@@ -15,4 +15,4 @@ function MyApp({ Component, pageProps }: AppProps) {
   );
 }
 
-export default MyApp;
+export default Runosaari;
diff --git a/pages/layout/Footer.tsx b/pages/components/Footer.tsx
similarity index 89%
rename from pages/layout/Footer.tsx
rename to pages/components/Footer.tsx
index 599b99f..386edc5 100644
--- a/pages/layout/Footer.tsx
+++ b/pages/components/Footer.tsx
@@ -1,8 +1,9 @@
 import Link from 'next/link';
+import Image from 'next/image';
 import React from 'react';
 import styles from '../../styles/Footer.module.scss';
 
-export const Footer = () => {
+const Footer = () => {
   return (
     <footer className={styles.footer}>
       <div className={styles.container}>
@@ -16,7 +17,7 @@ export const Footer = () => {
           <Link href='/#nav-bar'>
             <img
               className={styles.logo}
-              src='small-logo.png'
+              src='/small-logo.png'
               alt='small logo'
             />
           </Link>
@@ -38,3 +39,5 @@ export const Footer = () => {
     </footer>
   );
 };
+
+export default Footer;
diff --git a/pages/layout/Header.tsx b/pages/components/Header.tsx
similarity index 91%
rename from pages/layout/Header.tsx
rename to pages/components/Header.tsx
index 17956e2..317f131 100644
--- a/pages/layout/Header.tsx
+++ b/pages/components/Header.tsx
@@ -1,8 +1,9 @@
 import Link from 'next/link';
+import Image from 'next/image';
 import React from 'react';
 import styles from '../../styles/Header.module.scss';
 
-export const Header = () => {
+const Header = () => {
   return (
     <>
       <header className={styles.header}>
@@ -31,7 +32,7 @@ export const Header = () => {
         <div className={styles.logo} id='logo-start'>
           <img
             className={styles.logoImage}
-            src='runosaari-logo.jpg'
+            src='/runosaari-logo.jpg'
             alt='Runosaari logo'
           />
           <div className={styles.logoCredits}>
@@ -42,3 +43,5 @@ export const Header = () => {
     </>
   );
 };
+
+export default Header;