diff --git a/fwt/components/Footer/Footer.sass b/fwt/components/Footer/Footer.sass
new file mode 100644
index 0000000..2d87966
--- /dev/null
+++ b/fwt/components/Footer/Footer.sass
@@ -0,0 +1,8 @@
+.footer
+  padding: 1rem 0
+  margin: 0 20rem
+  position: fixed
+  bottom: 0
+  width: 100%
+  font-size: 0.75rem
+  opacity: 0.8
diff --git a/fwt/components/Footer/Footer.tsx b/fwt/components/Footer/Footer.tsx
new file mode 100644
index 0000000..ca71e92
--- /dev/null
+++ b/fwt/components/Footer/Footer.tsx
@@ -0,0 +1,13 @@
+import './Footer.sass'
+
+interface Props {
+  children: any
+}
+
+export default (props: Props) => {
+  return (
+    <>
+      <footer class="footer">{props.children}</footer>
+    </>
+  )
+}
diff --git a/fwt/components/Page/Page.sass b/fwt/components/Page/Page.sass
index 3d97ca8..af99849 100644
--- a/fwt/components/Page/Page.sass
+++ b/fwt/components/Page/Page.sass
@@ -1,13 +1,12 @@
 .page
   margin: 2rem
   height: auto
+  min-height: 90vh
 
 .column
   @extend .page
   display: flex
   flex-direction: column
-  text-align: center
-  justify-content: center
   align-items: center
 
 .row
diff --git a/fwt/components/Page/Page.tsx b/fwt/components/Page/Page.tsx
index d16977f..62d9a73 100644
--- a/fwt/components/Page/Page.tsx
+++ b/fwt/components/Page/Page.tsx
@@ -1,5 +1,5 @@
 import './Page.sass'
-import { Show, Switch, Match } from 'solid-js'
+import { Show } from 'solid-js'
 
 interface Props {
   children?: any
diff --git a/fwt/images/pat-alcala.avif b/fwt/images/pat-alcala.avif
new file mode 100644
index 0000000..6e280e0
Binary files /dev/null and b/fwt/images/pat-alcala.avif differ
diff --git a/fwt/images/pat-alcala.webp b/fwt/images/pat-alcala.webp
new file mode 100644
index 0000000..7ee78c6
Binary files /dev/null and b/fwt/images/pat-alcala.webp differ
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 5b00d64..c9d72e1 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -3,25 +3,37 @@ import Layout from '../layouts/Layout.astro'
 import Button from '../../fwt/components/Button/Button'
 import Logo from '../../fwt/components/Logo/Logo'
 import OptimizeLogo from '../../fwt/components/Optimizer/OptimizeLogo'
+import OptimizeImage from '../../fwt/components/Optimizer/OptimizeImage'
 import Link from '../../fwt/components/Link/Link'
 import Counter from '../components/Counter/Counter'
 import Page from '../../fwt/components/Page/Page'
+import Footer from '../../fwt/components/Footer/Footer'
+import Row from '../../fwt/components/Row/Row'
+import Image from '../../fwt/components/Image/Image'
+import PA1 from '../../fwt/images/pat-alcala.avif'
+import PA2 from '../../fwt/images/pat-alcala.webp'
 ---
 
 <Layout title="FWT">
   <Page alignment="column">
     <Link to="https://git.patalcala.com/patalcala9/fwt">
-      <!-- <OptimizeLogo size={250} /> -->
       <Logo size={250} />
     </Link>
 
     <h1>Fast WebApp Template</h1>
     <Counter client:load />
-    <Button edges="rounded" label="Show Built-in Components" to="/next" />
-  </Page>
+    <Button edges="rounded" label="FWT Components" to="/next" />
 
-  <style lang="sass">
-    h1
-      color: #3377AC
-  </style>
+    <Footer>
+      <Row content="right" gap={0.5}>
+        <Image avif={PA1.src} webp={PA2.src} size={100} />
+        <span>By: Pat Alcala</span>
+      </Row>
+    </Footer>
+
+    <style lang="sass">
+      h1
+        color: #3377AC
+    </style>
+  </Page>
 </Layout>
diff --git a/src/pages/next.astro b/src/pages/next.astro
index 367262c..d3226ac 100644
--- a/src/pages/next.astro
+++ b/src/pages/next.astro
@@ -12,7 +12,7 @@ import Column from '../../fwt/components/Column/Column'
 
 <Layout title="Home">
   <Page alignment="column">
-    <h1>Built-in Components</h1>
+    <h1>FWT Components</h1>
     <Button edges="rounded" label="Back to Home" to="/" />
 
     <section class="image">