diff --git a/apps/pxweb2/src/app/app.tsx b/apps/pxweb2/src/app/app.tsx
index 88e61fd3..7a7c8759 100644
--- a/apps/pxweb2/src/app/app.tsx
+++ b/apps/pxweb2/src/app/app.tsx
@@ -1,51 +1,83 @@
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 import styles from './app.module.scss';
 
-import { Button, Heading, BodyShort, Ingress, Label } from '@pxweb2/pxweb2-ui';
+import {
+  Button,
+  Heading,
+  BodyShort,
+  BodyLong,
+  Ingress,
+  Label,
+} from '@pxweb2/pxweb2-ui';
 
 function test(event: React.MouseEvent<HTMLButtonElement, MouseEvent>) {
   event.preventDefault();
   alert('test');
 }
 function testSubmit() {
-  alert('test submit'); 
+  alert('test submit');
 }
 
 export function App() {
   return (
     <>
-
-    <Heading level='1' size="xlarge"> Welcome to pxweb2!</Heading>
-
-      <h1>Welcome to pxweb2!</h1>
-
-      <Ingress>This page will display various components</Ingress>
-      <BodyShort size='medium' spacing align="center" weight='regular'>This is the BodyShort component</BodyShort>
-
-
-      <Button variant="primary" onClick={test}>Button</Button>
-      <Button variant="primary" disabled onClick={test}>Button</Button>
-      <Button variant="primary" icon="Pencil" onClick={test}></Button>
-      <Button variant="primary" icon="ChevronUp" onClick={test} size="small" ></Button>
-
-      <Button variant="secondary" onClick={test}>Button</Button>
-      <Button variant="secondary" disabled onClick={test}>Button</Button>
-      <Button variant="secondary" icon="Pencil" onClick={test}></Button>
-      <Button variant="secondary" icon="ChevronUp" onClick={test} size="small" ></Button>
-
-      <Button variant="tertiary" onClick={test}>Button</Button>
-      <Button variant="tertiary" disabled onClick={test}>Button</Button>
-      <Button variant="tertiary" icon="Pencil" onClick={test}></Button>
-      <Button variant="tertiary" icon="ChevronUp" onClick={test} size="small" ></Button>
-
-      <form id="form1" onSubmit={ testSubmit }>
-        <Label htmlFor="fname">First name:</Label><br />
-        <input type="text" id="fname" name="fname" defaultValue="John" /><br />
-        <Label htmlFor="lname" textcolor='subtle'>Last name:</Label><br />
+      <Heading level="1" size="xlarge">
+        Welcome to PxWeb 2.0
+      </Heading>
+      <br />
+      <Ingress spacing>
+        Ingress: This page will display various components
+      </Ingress>
+      <BodyShort size="medium" spacing align="start" weight="regular">
+        BodyShort: This component will be used for text with not more than 80
+        characters.
+      </BodyShort>
+      <BodyLong size="medium" spacing align="start" weight="regular">
+        BodyLong: This is a story about Little Red Ridinghood. One day she went
+        into the wood to visit her grandmother. The day after too, She visited
+        her every day, every week, every month, every year. She never saw a
+        wolf, no even a little fox.
+      </BodyLong>
+      <form id="form1" onSubmit={testSubmit}>
+        <Label htmlFor="fname" textcolor="subtle">
+          First name:
+        </Label>
+        <br />
+        <input type="text" id="fname" name="fname" defaultValue="John" />
+        <br />
+        <Label htmlFor="lname" textcolor="subtle">
+          Last name:
+        </Label>
+        <br />
         <input type="text" id="lname" name="lname" defaultValue="Doe" />
       </form>
-      <Button form="form1" variant="primary" type="submit">Button</Button>
-      
+      <br />
+      <Button form="form1" variant="primary" type="submit">
+        Submit
+      </Button>
+      <br />
+      <br />
+      <form id="form2" onSubmit={testSubmit}>
+        <Label htmlFor="address" textcolor="subtle">
+          Address:
+        </Label>
+        <br />
+        <input
+          type="text"
+          id="address"
+          name="address"
+          defaultValue="Baker Street no 45"
+        />
+      </form>
+      <br />
+      <Button form="form2" variant="secondary" type="submit">
+        Submit
+      </Button>
+      <br />
+      <br />
+      <Button variant="secondary" icon="FloppyDisk" onClick={test}></Button>
+      &nbsp;
+      <Button variant="secondary" icon="Heart" onClick={test}></Button>
     </>
   );
 }