diff --git a/frontend/src/components/Profile/Profile.js b/frontend/src/components/Profile/Profile.js
deleted file mode 100644
index 057b2a9..0000000
--- a/frontend/src/components/Profile/Profile.js
+++ /dev/null
@@ -1,14 +0,0 @@
-
-// This code just for testing the Navbar elements and should be change later
-
-import React from "react";
-
-const Profile = () => {
-  return (
-    <div>
-      <p>Profile</p>
-    </div>
-  );
-};
-
-export default Profile;
diff --git a/frontend/src/components/Profile/ProfileForm/ProfileForm.js b/frontend/src/components/Profile/ProfileForm/ProfileForm.js
deleted file mode 100644
index e69de29..0000000
diff --git a/frontend/src/components/Profile/index.js b/frontend/src/components/Profile/index.js
new file mode 100644
index 0000000..fb45692
--- /dev/null
+++ b/frontend/src/components/Profile/index.js
@@ -0,0 +1,159 @@
+import React, { Component } from 'react';
+import Fontawesome from 'react-fontawesome';
+import Modal from 'react-modal';
+
+import './style.css';
+const customStyles = {
+  content : {
+    width: '200px',
+    top: '50%',
+    left: '50%',
+    right: 'auto',
+    bottom: 'auto',
+    marginRight: '-50%',
+    transform: 'translate(-50%, -50%)'
+  }
+};
+class ProfileForm extends Component{
+  state = {
+    modalIsOPen:false,
+    modalMsg: '',
+    modalTitle: '',
+    locations: ['London', 'Gaza', 'Bristol', 'Liverpool'],
+    formData:{
+      cared_for_situation: "Alzheimer",
+      date_of_birth: "2018-08-04",
+      location: "LONDON",
+      looking_for: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do ",
+      offer: "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do ",
+    },
+  }
+
+  componentDidMount() {
+    const id = 4; // should get the id from the login token??
+    fetch(`api/profile?id=${id}`, {
+      credentials: 'same-origin',
+      method: 'GET',
+    }).then(res=>res.json())
+      .then((res) => {
+        const { sitution: cared_for_situation, age: date_of_birth, location, looking: looking_for, offer} = res[0];
+        this.setState({
+          cared_for_situation,
+          date_of_birth,
+          location,
+          looking_for,
+          offer,
+        })
+      })
+      .catch((err)=> {
+        this.openModal('Error', 'Some error happened, please refresh the page');
+      });
+  }
+
+  openModal = (title, msg) => {
+    this.setState({
+      modalIsOPen: true,
+      modalMsg: msg,
+      modalTitle: title,
+    });
+  }
+  closeModal = () => {
+    this.setState({modalIsOPen: false});
+  }
+
+  handleChange = (e) => {
+    const { value, name } = e.target;
+    this.setState((prevState) => {
+      const formData = JSON.parse(JSON.stringify(prevState.formData));
+      formData[name] = value;
+      return { formData };
+    });
+  }
+  
+  handleSubmit = (e) => {
+    e.preventDefault();
+    const { formData } = this.state;
+    const id = 4; // should get the id from the login token??
+    fetch(`api/profile?id=${id}`, {
+      credentials: 'same-origin',
+      headers: {
+        'content-type': 'application/json',
+      },
+      method: 'PUT',
+      body: formData,
+    }).then(res=>res.json())
+      .then((res) => {
+        this.openModal('Success', 'Your profile has been updated');
+      })
+      .catch((err) => {
+        this.openModal('Error', 'Some error happened, please try save the data again');
+      });
+  }
+
+  handleFocus = (e) => {
+    switch(e.target.tagName) {
+      case 'INPUT':
+      case 'SELECT':
+      case 'TEXTAREA':
+        e.target.classList.add('active');
+        break;
+    }
+  }
+
+  handleBlur = (e) => {
+    switch(e.target.tagName) {
+      case 'INPUT':
+      case 'SELECT':
+      case 'TEXTAREA':
+        e.target.classList.remove('active');
+        break;
+    }
+  }
+
+  render(){
+    const { locations }= this.state;
+    const { location, date_of_birth, cared_for_situation, looking_for, offer } = this.state.formData;
+
+    return (
+      <React.Fragment>
+        <Modal
+          isOpen={this.state.modalIsOPen}
+          onRequestClose={this.closeModal}
+          style={customStyles}
+        >
+          <div className="public-profile--modal">
+            <h2>Error</h2>
+            <p>{this.state.modalMsg}</p>
+            <button onClick={this.closeModal}>Ok</button>
+          </div>
+        </Modal>
+        <form className="public-profile" onBlur={this.handleBlur} onFocus={this.handleFocus} onSubmit={this.handleSubmit} >
+          <label htmlFor="location">Location:</label>
+          <Fontawesome className="caret-down" name="caret-down" />
+          <select name="location" id="location" defaultValue={location? location:"no-value"} onChange={this.handleChange} >
+            <option disabled value="no-value">Select a location</option>
+            {locations.map(location => {
+              return <option key={location} value={location.toUpperCase()}>{location}</option>
+            })} 
+          </select>
+
+          <label htmlFor="dateOfBirth">Date Of Birth:</label>
+          <input type="date" name="date_of_birth" id="dateOfBirth" value={date_of_birth} onChange={this.handleChange} />
+          
+          <label htmlFor="caredForSituation">Cared For Situtation</label>
+          <input type="text" name="cared_for_situation" id="caredForSituation" value={cared_for_situation} onChange={this.handleChange}/>
+
+          <label htmlFor="lookingFor">What are you looking for?</label>
+          <textarea type="text" name="looking_for" id="lookingFor" value={looking_for} onChange={this.handleChange} />
+
+          <label htmlFor="offer">What can you offer to other carers?</label>
+          <textarea type="text" name="offer" id="offer" value={offer} onChange={this.handleChange} />
+
+          <button className="button" type="submit">Save</button>
+        </form>
+      </React.Fragment>
+    );
+  }
+}
+
+export default ProfileForm;
\ No newline at end of file
diff --git a/frontend/src/components/Profile/style.css b/frontend/src/components/Profile/style.css
new file mode 100644
index 0000000..32f0a7e
--- /dev/null
+++ b/frontend/src/components/Profile/style.css
@@ -0,0 +1,68 @@
+.public-profile {
+  padding-top: 20px;
+  padding-bottom: 20px;
+  width: 335px;
+  min-height: 440px;
+  background-color: #F3F4F1;
+  margin: 20px auto;
+  position: relative;
+}
+
+.public-profile label {
+  margin-left: 28px;
+  font-size: 18px;
+  display: block;
+}
+
+.public-profile .caret-down {
+  position: absolute;
+  top: 63px;
+  right: 45px;
+  font-size: 19px;
+  color: #48a1af;
+}
+
+.public-profile select {
+  appearance: none;
+}
+
+.public-profile select,
+.public-profile textarea,
+.public-profile input {
+  cursor: pointer;
+  border: none;
+  border-bottom: 1px solid rgba(0,0,0,0.4);
+  color: rgba(0,0,0,0.65);  
+  display: block;
+  width: 275px;
+  height: 40px;
+  margin: 10px auto;
+  padding-left: 14px;
+  background-color: rgba(255,255,255,0.1);
+}
+
+.public-profile textarea {
+  min-height: 80px;
+}
+
+.public-profile .active {
+  background-color: rgba(255,255,255,0.8);
+  transition: all 0.2s ease;
+}
+
+.public-profile .button, .public-profile--modal button {
+  cursor: pointer;
+  width: 90px;
+  height: 35px;
+  text-align: center;
+  border-radius: 18px;
+  background-color: #48A1AF;
+  border: none;
+  margin: 0 auto;
+  display: block;
+}
+
+.public-profile--modal {
+  text-align: center;
+  font-size: 15px;
+}