diff --git a/src/builtin-components/Button/Button.sass b/src/builtin-components/Button/Button.sass
index 329ba1d..9371868 100644
--- a/src/builtin-components/Button/Button.sass
+++ b/src/builtin-components/Button/Button.sass
@@ -1,223 +1,22 @@
 @use '/src/styles/variables.sass' as vars
-@use '/src/styles/fonts.sass' as fonts
 @use 'sass:color'
 
-$bulmaPrimary: rgb(0, 235, 199)
-$bulmaPrimaryText: rgb(0, 31, 26)
-$bulmaLink: rgb(92, 111, 255)
-$bulmaLinkText: rgb(245, 246, 255)
-$bulmaInfo: rgb(128, 217, 255)
-$bulmaInfoText: rgb(0, 36, 51)
-$bulmaSuccess: rgb(91, 205, 154)
-$bulmaSuccessText: rgb(10, 31, 21)
-$bulmaWarning: rgb(255, 191, 41)
-$bulmaWarningText: rgb(41, 29, 0)
-$bulmaDanger: rgb(255, 128, 153)
-$bulmaDangerText: rgb(26, 0, 5)
-$bulmaLight: rgb(255, 255, 255)
-$bulmaLightText: rgb(46, 51, 61)
-$bulmaDark: rgb(57, 63, 76)
-$bulmaDarkText: rgb(243, 244, 246)
-$bulmaText: rgb(31, 34, 41)
-$bulmaTextText: rgb(235, 236, 240)
-$bulmaGhost: rgba(0,0,0,0)
-$bulmaGhostText: rgb(66, 88, 255)
-
-$bootstrapTextLight: rgb(255, 255, 253)
-$bootstrapTextDark: rgb(0, 0, 2)
-$bootstrapTextLink: rgb(139, 185, 254)
-$bootstrapPrimary: rgb(13, 110, 253)
-$bootstrapSecondary: rgb(92, 99, 106)
-$bootstrapSuccess: rgb(21, 115, 71)
-$bootstrapDanger: rgb(187, 45, 59)
-$bootstrapWarning: rgb(255, 202, 44)
-$bootstrapInfo: rgb(49, 210, 242)
-$bootstrapLight: rgb(211, 212, 213)
-$bootstrapDark: rgb(33, 37, 41)
-
 .button
-  background-color: vars.$primaryColor
+  background: vars.$primaryColor
   border: none
+  border-radius: 32px
   color: white
   padding: 0.5rem 1.25rem
   text-align: center
   text-decoration: none
   display: inline-block
-  font-size: 1rem
-  font-weight: 500
+  font-size: 0.75rem
+  font-weight: 700
   cursor: pointer
   transition: all 0.2s ease-out
 
   &:hover
-    background-color: color.adjust(vars.$primaryColor, $blackness: 20%)
+    background: color.adjust(vars.$primaryColor, $blackness: 20%)
 
   &:active
     transform: scale(0.95)
-
-.bu-primary
-  @extend .button
-  font-family: fonts.$Inter
-  background-color: $bulmaPrimary
-  color: $bulmaPrimaryText
-  border: none
-  font-size: 1rem
-  border-radius: 0.375rem
-  font-weight: 500
-  padding: 0.5rem 1.25rem
-  height: 2.5rem
-
-  &:hover
-    background-color: color.adjust($bulmaPrimary, $lightness: 10%)
-
-.bu-link
-  @extend .bu-primary
-  background-color: $bulmaLink
-  color: $bulmaLinkText
-
-  &:hover
-    background-color: color.adjust($bulmaLink, $lightness: 5%)
-
-.bu-info
-  @extend .bu-primary
-  background-color: $bulmaInfo
-  color: $bulmaInfoText
-
-  &:hover
-    background-color: color.adjust($bulmaInfo, $lightness: 5%)
-
-.bu-success
-  @extend .bu-primary
-  background-color: $bulmaSuccess
-  color: $bulmaSuccessText
-
-  &:hover
-    background-color: color.adjust($bulmaSuccess, $lightness: 5%)
-
-.bu-warning
-  @extend .bu-primary
-  background-color: $bulmaWarning
-  color: $bulmaWarningText
-
-  &:hover
-    background-color: color.adjust($bulmaWarning, $lightness: 5%)
-
-.bu-danger
-  @extend .bu-primary
-  background-color: $bulmaDanger
-  color: $bulmaDangerText
-
-  &:hover
-    background-color: color.adjust($bulmaDanger, $lightness: 5%)
-
-.bu-light
-  @extend .bu-primary
-  background-color: $bulmaLight
-  color: $bulmaLightText
-
-  &:hover
-    background-color: color.adjust($bulmaLight, $lightness: 5%)
-
-.bu-dark
-  @extend .bu-primary
-  background-color: $bulmaDark
-  color: $bulmaDarkText
-
-  &:hover
-    background-color: color.adjust($bulmaDark, $lightness: 5%)
-
-.bu-text
-  @extend .bu-primary
-  background-color: rgba(0,0,0,0)
-  color: $bulmaTextText
-  text-decoration: underline
-
-  &:hover
-    background-color: hsl(221,14%,14%)
-
-.bu-ghost
-  @extend .bu-primary
-  background-color: $bulmaGhost
-  color: $bulmaGhostText
-
-  &:hover
-    background-color: transparent
-    text-decoration: underline
-
-.bo-primary
-  @extend .button
-  font-family: 'Segoe UI', fonts.$Roboto
-  background-color: $bootstrapPrimary
-  color: $bootstrapTextLight
-  border: none
-  font-size: 1rem
-  border-radius: 0.375rem
-  font-weight: 400
-  padding: 0.5rem 1.25rem
-  height: 2.5rem
-  margin: 0.25rem 0.125rem
-
-  &:hover
-    background-color: color.adjust($bootstrapPrimary, $blackness: 10%)
-
-.bo-secondary
-  @extend .bo-primary
-  background-color: $bootstrapSecondary
-
-  &:hover
-    background-color: color.adjust($bootstrapSecondary, $blackness: 10%)
-
-.bo-success
-  @extend .bo-primary
-  background-color: $bootstrapSuccess
-
-  &:hover
-    background-color: color.adjust($bootstrapSuccess, $blackness: 10%)
-
-.bo-danger
-  @extend .bo-primary
-  background-color: $bootstrapDanger
-
-  &:hover
-    background-color: color.adjust($bootstrapDanger, $blackness: 10%)
-
-.bo-warning
-  @extend .bo-primary
-  background-color: $bootstrapWarning
-  color: $bootstrapTextDark
-
-  &:hover
-    background-color: color.adjust($bootstrapWarning, $lightness: 5%)
-
-.bo-info
-  @extend .bo-primary
-  background-color: $bootstrapInfo
-  color: $bootstrapTextDark
-
-  &:hover
-    background-color: color.adjust($bootstrapInfo, $lightness: 5%)
-
-.bo-light
-  @extend .bo-primary
-  background-color: $bootstrapLight
-  color: $bootstrapTextDark
-
-  &:hover
-    background-color: color.adjust($bootstrapLight, $blackness: 10%)
-
-.bo-dark
-  @extend .bo-primary
-  background-color: $bootstrapDark
-  // color: $bootstrapTextDark
-
-  &:hover
-    background-color: color.adjust($bootstrapDark, $lightness: 10%)
-
-.bo-link
-  @extend .bo-primary
-  background-color: transparent
-  color: $bootstrapTextLink
-  text-decoration: underline
-
-  &:hover
-    color: color.adjust($bootstrapTextLink, $lightness: 5%)
-    background-color: transparent
diff --git a/src/builtin-components/Button/Button.tsx b/src/builtin-components/Button/Button.tsx
index 156b29f..5a4611a 100644
--- a/src/builtin-components/Button/Button.tsx
+++ b/src/builtin-components/Button/Button.tsx
@@ -1,65 +1,25 @@
-import { boolean } from 'astro:schema'
 import './Button.sass'
-import { Show, Switch, Match } from 'solid-js'
+import { Show } from 'solid-js'
 
 interface Props {
   label?: string
   to?: string
   onClick?: () => void
-  edges?: 'curved' | 'rounded' | 'flat'
-  design?: 'bu-primary' | 'bu-link' | 'bu-info' | 'bu-success' | 'bu-warning' | 'bu-danger' | 'bu-dark' | 'bu-light' | 'bu-text' | 'bu-ghost' | 'bo-primary' | 'bo-secondary' | 'bo-success' | 'bo-danger' | 'bo-warning' | 'bo-info' | 'bo-light' | 'bo-dark' | 'bo-link'
-}
-
-const getBorderRadius = (edge: Props['edges']) => {
-  switch (edge) {
-    case 'curved':
-      return 'border-radius: 6px'
-    case 'rounded':
-      return 'border-radius: 32px'
-    case 'flat':
-      return 'border-radius: 0'
-    default:
-      return 'border-radius: 0'
-  }
 }
 
 export default (props: Props) => {
-  const borderRadius = getBorderRadius(props.edges)
-
   return (
     <>
       <Show when={props.to}>
-        <Switch>
-          <Match when={props.design}>
-            <a href={props.to} aria-label={props.label}>
-              <button class={props.design} style={borderRadius}>
-                {props.label || 'Click Me!'}
-              </button>
-            </a>
-          </Match>
-          <Match when={!props.design}>
-            <a href={props.to} aria-label={props.label}>
-              <button class="button" style={borderRadius}>
-                {props.label || 'Click Me!'}
-              </button>
-            </a>
-          </Match>
-        </Switch>
+        <a href={props.to} aria-label={props.label}>
+          <button class="button">{props.label || 'Click Me!'}</button>
+        </a>
       </Show>
 
       <Show when={!props.to}>
-        <Switch>
-          <Match when={props.design}>
-            <button class={props.design} onClick={props.onClick} style={borderRadius}>
-              {props.label || 'Click Me!'}
-            </button>
-          </Match>
-          <Match when={!props.design}>
-            <button class="button" onClick={props.onClick} style={borderRadius}>
-              {props.label || 'Click Me!'}
-            </button>
-          </Match>
-        </Switch>
+        <button class="button" onClick={props.onClick}>
+          {props.label || 'Click Me!'}
+        </button>
       </Show>
     </>
   )
diff --git a/src/builtin-components/Image/Image.tsx b/src/builtin-components/Image/Image.tsx
index 46e9acd..438eae0 100644
--- a/src/builtin-components/Image/Image.tsx
+++ b/src/builtin-components/Image/Image.tsx
@@ -27,7 +27,7 @@ export default (props: Props) => {
 
   return (
     <>
-      <picture>
+      <picture >
         <source srcset={imageSrc().replace(/\.webp$/, '.avif')} type="image/avif" />
         <source srcset={imageSrc()} type="image/webp" />
         <img src={imageSrc()} width={props.size} height="auto" decoding="async" loading="lazy" alt={props.alt} />
diff --git a/src/pages/index.astro b/src/pages/index.astro
index 69b8529..dcb6894 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -3,23 +3,29 @@ import Layout from '../layouts/Layout.astro'
 import Button from '../builtin-components/Button/Button.tsx'
 import Image from '../builtin-components/Image/Image'
 import Link from '../builtin-components/Link/Link'
-import Counter from '../components/Counter/Counter.tsx'
-import Page from '../builtin-components/Page/Page'
+import Counter from '../components/Counter.tsx'
 ---
 
 <Layout title="FWT">
-  <Page alignment="column">
+  <main class="page">
     <Link to="https://git.patalcala.com/patalcala9/fwt">
       <Image src="fwt.png" size={250} />
     </Link>
 
     <h1>Fast WebApp Template</h1>
-    <Counter client:load />
-    <Button edges="rounded" label="Show Built-in Components" to="/next" />
-  </Page>
+    <Counter client:load/>
+    <Button label="Next Page" to="/next" />
+  </main>
 
   <style lang="sass">
-    h1
-      color: #3377AC
+    .page
+      display: flex
+      flex-direction: column
+      flex-wrap: wrap
+      justify-content: center
+      align-items: center
+      align-content: center
+      margin: 2rem
+      height: 90vh
   </style>
 </Layout>
diff --git a/src/pages/next.astro b/src/pages/next.astro
index c34b93b..3e5696e 100644
--- a/src/pages/next.astro
+++ b/src/pages/next.astro
@@ -2,21 +2,17 @@
 import Layout from '../layouts/Layout.astro'
 import Button from '../builtin-components/Button/Button.tsx'
 import Image from '../builtin-components/Image/Image'
-import Page from '../builtin-components/Page/Page'
 ---
 
 <Layout title="Home">
-  <Page alignment='column'>
-    <h1>Built-in Components</h1>
-    <Button edges='rounded' label="Back to Home" to="/" />
+  <main class="page">
+    <h1>Second Page</h1>
+    <Button label="Back to Home" to="/" />
 
     <section class="image">
       <Image src="sample.png" alt="Example Image" size={400} />
-      <Image src="sample.png" alt="Example Image" size={400} />
-      <Image src="sample.png" alt="Example Image" size={400} />
-      <Image src="sample.png" alt="Example Image" size={400} />
     </section>
-  </Page>
+  </main>
 </Layout>
 
 <style lang="sass">