diff --git a/client/src/components/Apps/Figma/Figma.js b/client/src/components/Apps/Figma/Figma.js
index 5499d373..c84f4757 100644
--- a/client/src/components/Apps/Figma/Figma.js
+++ b/client/src/components/Apps/Figma/Figma.js
@@ -1,7 +1,45 @@
-import React from "react";
+import React, { Component } from 'react';
+import './../../searchbar.component'
+import SearchBar from "./../../searchbar.component"
+import FigmaAbout from "./about-secttion/FigmaAbout";
+import FigmaMessages from "./messages-section/FigmaMessages";
+import  logo from "./images/fignaLogo.png"
+import './css/Figma.css'
+
+
+const initialState = {
+  page : 'about'
+}
+class Figma extends Component{
+  constructor() {
+    super()
+    this.state = initialState
+  }
+
+  
+
+  render (){
+    return <>
+    <SearchBar />
+    <div className ='Start-title'>
+      <div className ="figmalogo-container">
+        <img src ={logo} />
+      </div>
+      <h4 className ="Logo-tag">Figma</h4>
+      <div className= "arrow-down">^</div>
+    </div>
+    <div className='welcome-nav'>
+      <h4 onClick ={() => {this.setState({page : 'messages'})}} className={this.state.page === 'about'? '' : 'selected'}>Messages</h4>
+      <h4 onClick ={() => {this.setState({page : 'about'}) }} className={this.state.page === 'about'? 'selected' : ''}>About</h4>
+    </div>{
+      this.state.page === 'about'?
+      <FigmaAbout /> :
+      <FigmaMessages />
+    }
+    
+  </>;
+  }
+}
 
-const Figma = () => {
-  return <div>this is the figma page</div>;
-};
 
 export default Figma;
diff --git a/client/src/components/Apps/Figma/about-secttion/FigmaAbout.js b/client/src/components/Apps/Figma/about-secttion/FigmaAbout.js
new file mode 100644
index 00000000..4cf687e6
--- /dev/null
+++ b/client/src/components/Apps/Figma/about-secttion/FigmaAbout.js
@@ -0,0 +1,14 @@
+import React from "react";
+import  logo from "./../images/fignaLogo.png"
+import ss1 from "./../images/ss1.png"
+import ss2 from "./../images/ss2.png"
+import ss3 from "./../images/ss3.png"
+import './../css/about.css'
+
+const FigmaAbout = () => {
+    return <>
+        <p>This is the about section</p>
+    </>
+}
+
+export default FigmaAbout
\ No newline at end of file
diff --git a/client/src/components/Apps/Figma/css/Figma.css b/client/src/components/Apps/Figma/css/Figma.css
new file mode 100644
index 00000000..06a8048d
--- /dev/null
+++ b/client/src/components/Apps/Figma/css/Figma.css
@@ -0,0 +1,58 @@
+@import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400&display=swap');
+
+*{
+    font-family: 'Lato', sans-serif;
+   
+}
+.Start-title {
+    display: flex;
+    padding: 20px 0 20px 20px;
+    justify-content: flex-start;
+    align-items: center;
+}
+
+.Start-title h4 {
+    font-size: 25px;
+    margin-left: 5px;
+    font-weight: 700;
+}
+
+.Start-title .arrow-down {
+    transform: rotate(180deg) translateX(-5px);
+    font-size: 15px;
+}
+
+.figmalogo-container {
+    width: 44px;
+
+}
+
+.figmalogo-container img {
+    border-radius: 8px;
+}
+
+.welcome-nav {
+    display: flex;
+    justify-content: flex-start;
+    align-items: center;
+    height: auto;
+    width: 100%;
+    border-top: .7px solid #cfcfcf;
+    border-bottom: .7px solid #cfcfcf;
+    padding-left: 20px;
+}
+.welcome-nav h4 {
+    padding: 10px;
+    font-size: 14px;
+    font-weight: 700;
+    cursor: pointer;
+}
+
+.selected {
+    border-bottom: 1px solid #0ACF83;
+}
+
+.welcome-nav h4:hover {
+    border-bottom: 1px solid #0ACF83;
+}
+
diff --git a/client/src/components/Apps/Figma/css/about.css b/client/src/components/Apps/Figma/css/about.css
new file mode 100644
index 00000000..d044a3db
--- /dev/null
+++ b/client/src/components/Apps/Figma/css/about.css
@@ -0,0 +1,6 @@
+@import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400&display=swap');
+
+*{
+    font-family: 'Lato', sans-serif;
+   
+}
diff --git a/client/src/components/Apps/Figma/css/messages.css b/client/src/components/Apps/Figma/css/messages.css
new file mode 100644
index 00000000..7bdb38b0
--- /dev/null
+++ b/client/src/components/Apps/Figma/css/messages.css
@@ -0,0 +1,7 @@
+@import url('https://fonts.googleapis.com/css2?family=Lato:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400&display=swap');
+
+*{
+    font-family: 'Lato', sans-serif;
+   
+}
+
diff --git a/client/src/components/Apps/Figma/images/fignaLogo.png b/client/src/components/Apps/Figma/images/fignaLogo.png
new file mode 100644
index 00000000..b7bcd8b6
Binary files /dev/null and b/client/src/components/Apps/Figma/images/fignaLogo.png differ
diff --git a/client/src/components/Apps/Figma/images/foo.png b/client/src/components/Apps/Figma/images/foo.png
new file mode 100644
index 00000000..c560287f
Binary files /dev/null and b/client/src/components/Apps/Figma/images/foo.png differ
diff --git a/client/src/components/Apps/Figma/images/ss1.png b/client/src/components/Apps/Figma/images/ss1.png
new file mode 100644
index 00000000..7d730e93
Binary files /dev/null and b/client/src/components/Apps/Figma/images/ss1.png differ
diff --git a/client/src/components/Apps/Figma/images/ss2.png b/client/src/components/Apps/Figma/images/ss2.png
new file mode 100644
index 00000000..dfbb3c02
Binary files /dev/null and b/client/src/components/Apps/Figma/images/ss2.png differ
diff --git a/client/src/components/Apps/Figma/images/ss3.png b/client/src/components/Apps/Figma/images/ss3.png
new file mode 100644
index 00000000..04be4314
Binary files /dev/null and b/client/src/components/Apps/Figma/images/ss3.png differ
diff --git a/client/src/components/Apps/Figma/messages-section/FigmaMessages.js b/client/src/components/Apps/Figma/messages-section/FigmaMessages.js
new file mode 100644
index 00000000..d0bcd1f4
--- /dev/null
+++ b/client/src/components/Apps/Figma/messages-section/FigmaMessages.js
@@ -0,0 +1,14 @@
+import React from "react";
+import ss1 from './../images/ss1.png'
+import logo from './../images/fignaLogo.png'
+import './../css/messages.css'
+
+const FigmaMessages = () => {
+    return <>
+            <p>This is the message section .</p>
+    </>
+}
+
+
+
+export default FigmaMessages
\ No newline at end of file