diff --git a/assets/js/EditProfile.jsx b/assets/js/EditProfile.jsx
index 5d4dfecedaeaadfd2d093437c34d063536c970d7..c27ba0569ddcff2c0d895c189f47718245c8f31d 100644
--- a/assets/js/EditProfile.jsx
+++ b/assets/js/EditProfile.jsx
@@ -227,238 +227,435 @@ export default class EditProfile extends React.Component {
     if (show) {
       return (
         <div className="editProfile">
-        <Segment className="profile-form">
-          <Header as="h3" textAlign="center">
-            <Icon name="edit" />
-            <Header.Content>Edit Profile Page</Header.Content>
-          </Header>
-          <ModalAlert
-            ref={(modal) => {
-              this.modalAlert = modal;
-            }}
-          />
-          <Form
-            ref={(input) => {
-              this.form = input;
-            }}
-            key={this.state.refresh}
-            size="small"
-          >
-            <Form.Field>
-              <label htmlFor="photo">Profile Picture</label>
-              <input
-                onChange={this.handleFile}
-                placeholder="Profile Photo.jpg"
-                name="photo"
-                type="File"
-              />
-            </Form.Field>
-            <Form.Field>
-              <label htmlFor="email">Email</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.email === null
-                    ? 'jojon@email.com'
-                    : this.state.email
-                }
-                defaultValue={
-                  this.state.email === null ? null : this.state.email
-                }
-                name="email"
-              />
-            </Form.Field>
-            <Form.Field>
-              <label htmlFor="phone_number">No. Hp</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.phone_number === null
-                    ? '08123456789'
-                    : this.state.phone_number
-                }
-                defaultValue={
-                  this.state.phone_number === null
-                    ? null
-                    : this.state.phone_number
-                }
-                name="phone_number"
-              />
-            </Form.Field>
-            <Form.Field>
-              <label htmlFor="gender">Jenis Kelamin</label>
-              <Form.Radio
-                label="Perempuan"
-                name="gender"
-                value="Perempuan"
-                onClick={this.handleRadioGender}
-              />
-              <Form.Radio
-                label="Laki-laki"
-                name="gender"
-                value="Laki-laki"
-                onClick={this.handleRadioGender}
-              />
-            </Form.Field>
-            <Form.Field>
-              <label htmlFor="self_description">Deskripsi Diri</label>
-              <input
-                onChange={this.handleChange}
-                placeholder="Saya suka belajar"
-                name="self_description"
-              />
-            </Form.Field>
-            
-            <Form.Field>
-              <label htmlFor="region">Region</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.region === null ? 'Indonesia' : this.state.region
-                }
-                defaultValue={
-                  this.state.region === null ? null : this.state.region
-                }
-                name="region"
-              />
-            </Form.Field>
-            <Form.Field>
-              <label htmlFor="alamat">Alamat</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.alamat === null
-                    ? 'JL. Satya Raya No.41'
-                    : this.state.alamat
-                }
-                defaultValue={
-                  this.state.alamat === null ? null : this.state.alamat
-                }
-                name="alamat"
-              />
-            </Form.Field>
-            <Form.Field>
-              <label htmlFor="skills">Skills</label>
-              <input
-                onChange={this.handleChange}
-                placeholder="Isi sesuai dengan keahlian anda"
-                defaultValue={this.state.skills === null ? 'Competitive Programming' : this.state.skills}
-                name="skills"
-              />
-            </Form.Field>
-            <Form.Field>
-              <label htmlFor="languages">Bahasa yang dikuasai</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.languages === null
-                    ? 'Indonesia'
-                    : this.state.languages
-                }
-                defaultValue={
-                  this.state.languages === null ? null : this.state.languages
-                }
-                name="languages"
-              />
-            </Form.Field>
-
-
-            <Form.Field>
-              <label htmlFor="interests">Interests</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={this.state.interests === null ? 'Machine Learning' : this.state.interests}
-                defaultValue={this.state.interests === null ? null : this.state.interests}
-                name="interests"
-              />
-            </Form.Field>
-
-            <Form.Field>
-              <label htmlFor="related_course">Related Coursework Taken</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.related_course === null
-                    ? 'Intraction System, Machine Learning'
-                    : this.state.related_course
-                }
-                defaultValue={
-                  this.state.related_course === null ? null : this.state.related_course
-                }
-                name="related_course"
-              />
-            </Form.Field>
-
-            <Form.Field>
-              <label htmlFor="resume">Resume</label>
-              <input
-                onChange={this.handleFile}
-                placeholder="Resume"
-                name="resume"
-                type="File"
-              />
-            </Form.Field>
-            <Form.Field>
-              <label htmlFor="expected_salary">Expected Salary</label>
-              <input onChange={this.handleChange} placeholder="2000000" name="expected_salary" />
-            </Form.Field>
-            <Form.Field>
-              <label htmlFor="intro">Intro</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.intro === null
-                    ? 'Ceritakan dirimu secara singkat'
-                    : this.state.intro
-                }
-                defaultValue={
-                  this.state.intro === null ? null : this.state.intro
-                }
-                name="intro"
-              />
-            </Form.Field>
-            <Form.Field>
-              <label htmlFor="intro">Status Pencarian Kerja</label>
-              <Form.Radio
-                label="Aktif"
-                name="job_seeking_status"
-                value="Active"
-                onClick={this.handleRadio}
-              />
-              <Form.Radio
-                label="Pasif"
-                name="job_seeking_status"
-                value="Passive"
-                onClick={this.handleRadio}
-              />
-            </Form.Field>
-            <Form.Field>
-              <Checkbox
-                onChange={this.handleCheckbox}
-                checked={!!this.state.show_transcript}
-                label="Ijinkan perusahaan tempat saya mendaftar untuk melihat transkrip akademik saya"
-                name="show_transcript"
-              />
-            </Form.Field>
-            <Form.Field>
-              <label htmlFor="student_gpa">GPA</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.student_gpa === null
-                    ? '3.50'
-                    : this.state.student_gpa
-                }
-                defaultValue={
-                  this.state.student_gpa === null
-                    ? null
-                    : this.state.student_gpa
-                }
-                name="student_gpa"
-              />
-            </Form.Field>
-
-            <Form.Field>
+          <Segment className="profile-form">
+            <Header as="h3" textAlign="center">
+              <Icon name="edit" />
+              <Header.Content>Edit Profile Page</Header.Content>
+            </Header>
+            <ModalAlert
+              ref={(modal) => {
+                this.modalAlert = modal;
+              }}
+            />
+            <Form
+              ref={(input) => {
+                this.form = input;
+              }}
+              key={this.state.refresh}
+              size="small"
+            >
+              <Form.Field>
+                <label htmlFor="photo">Profile Picture</label>
+                <input
+                  onChange={this.handleFile}
+                  placeholder="Profile Photo.jpg"
+                  name="photo"
+                  type="File"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="email">Email</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.email === null
+                      ? 'jojon@email.com'
+                      : this.state.email
+                  }
+                  defaultValue={
+                    this.state.email === null ? null : this.state.email
+                  }
+                  name="email"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="phone_number">No. Hp</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.phone_number === null
+                      ? '08123456789'
+                      : this.state.phone_number
+                  }
+                  defaultValue={
+                    this.state.phone_number === null
+                      ? null
+                      : this.state.phone_number
+                  }
+                  name="phone_number"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="gender">Jenis Kelamin</label>
+                <Form.Radio
+                  label="Perempuan"
+                  name="gender"
+                  value="Perempuan"
+                  onClick={this.handleRadioGender}
+                />
+                <Form.Radio
+                  label="Laki-laki"
+                  name="gender"
+                  value="Laki-laki"
+                  onClick={this.handleRadioGender}
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="self_description">Deskripsi Diri</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder="Saya suka belajar"
+                  name="self_description"
+                />
+              </Form.Field>
+
+              <Form.Field>
+                <label htmlFor="region">Region</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.region === null ? 'Indonesia' : this.state.region
+                  }
+                  defaultValue={
+                    this.state.region === null ? null : this.state.region
+                  }
+                  name="region"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="alamat">Alamat</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.alamat === null
+                      ? 'JL. Satya Raya No.41'
+                      : this.state.alamat
+                  }
+                  defaultValue={
+                    this.state.alamat === null ? null : this.state.alamat
+                  }
+                  name="alamat"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="related_course">Related Coursework Taken</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.related_course === null
+                      ? 'Intraction System, Machine Learning'
+                      : this.state.related_course
+                  }
+                  defaultValue={
+                    this.state.related_course === null ? null : this.state.related_course
+                  }
+                  name="related_course"
+                />
+              </Form.Field>
+
+              <Form.Field>
+                <label htmlFor="resume">Resume</label>
+                <input
+                  onChange={this.handleFile}
+                  placeholder="Resume"
+                  name="resume"
+                  type="File"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="expected_salary">Expected Salary</label>
+                <input onChange={this.handleChange} placeholder="2000000" name="expected_salary" />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="intro">Intro</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.intro === null
+                      ? 'Ceritakan dirimu secara singkat'
+                      : this.state.intro
+                  }
+                  defaultValue={
+                    this.state.intro === null ? null : this.state.intro
+                  }
+                  name="intro"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="volunteer">Volunteering Experience</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder="Ketua Organisasi A - 2020"
+                  name="volunteer"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="student_gpa">GPA</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.student_gpa === null
+                      ? '3.50'
+                      : this.state.student_gpa
+                  }
+                  defaultValue={
+                    this.state.student_gpa === null
+                      ? null
+                      : this.state.student_gpa
+                  }
+                  name="student_gpa"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="resume">Resume</label>
+                <input
+                  onChange={this.handleFile}
+                  placeholder="Resume"
+                  name="resume"
+                  type="File"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="expected_salary">Expected Salary</label>
+                <input onChange={this.handleChange} placeholder="2000000" name="expected_salary" />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="intro">Intro</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.intro === null
+                      ? 'Ceritakan dirimu secara singkat'
+                      : this.state.intro
+                  }
+                  defaultValue={
+                    this.state.intro === null ? null : this.state.intro
+                  }
+                  name="intro"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="student_gpa">GPA</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.student_gpa === null
+                      ? '3.50'
+                      : this.state.student_gpa
+                  }
+                  defaultValue={
+                    this.state.student_gpa === null
+                      ? null
+                      : this.state.student_gpa
+                  }
+                  name="student_gpa"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="dependants">Dependants</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.dependants === null ? '0' : this.state.dependants
+                  }
+                  defaultValue={
+                    this.state.dependants === null ? null : this.state.dependants
+                  }
+                  name="dependants"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="intro">Status Pencarian Kerja</label>
+                <Form.Radio
+                  label="Aktif"
+                  name="job_seeking_status"
+                  value="Active"
+                  onClick={this.handleRadio}
+                />
+                <Form.Radio
+                  label="Pasif"
+                  name="job_seeking_status"
+                  value="Passive"
+                  onClick={this.handleRadio}
+                />
+              </Form.Field>
+              <Form.Field>
+                <Checkbox
+                  onChange={this.handleCheckbox}
+                  checked={!!this.state.show_transcript}
+                  label="Ijinkan perusahaan tempat saya mendaftar untuk melihat transkrip akademik saya"
+                  name="show_transcript"
+                />
+              </Form.Field>
+            </Form>
+          </Segment>
+
+          <Segment className="experiences-form">
+            <Header as="h3" textAlign="center">
+              <Icon name="edit" />
+              <Header.Content>Edit Experience</Header.Content>
+            </Header>
+            <Form
+              ref={(input) => {
+                this.form = input;
+              }}
+              key={this.state.refresh}
+              size="small"
+              onSubmit={this.handleSubmit}
+            >
+
+              <Form.Field>
+                <label htmlFor="latest_work">Latest Working Experience</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.latest_work === null
+                      ? 'Teaching Asssistant at Fasilkom UI'
+                      : this.state.latest_work
+                  }
+                  defaultValue={
+                    this.state.latest_work === null
+                      ? null
+                      : this.state.latest_work
+                  }
+                  name="latest_work"
+                />
+              </Form.Field>
+
+              <Form.Field>
+                <label htmlFor="latest_work_desc">
+                  Latest Working Experience Description
+              </label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.latest_work_desc === null
+                      ? 'Evaluate weekly assignment for 15 students'
+                      : this.state.latest_work_desc
+                  }
+                  defaultValue={
+                    this.state.latest_work_desc === null
+                      ? null
+                      : this.state.latest_work_desc
+                  }
+                  name="latest_work_desc"
+                />
+              </Form.Field>
+
+              <Form.Field>
+                <label htmlFor="awards">Awards and Achievements</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.awards === null
+                      ? 'Juara 2 UIUX Gemastik 2019'
+                      : this.state.awards
+                  }
+                  defaultValue={
+                    this.state.awards === null ? null : this.state.awards
+                  }
+                  name="awards"
+                />
+              </Form.Field>
+
+              <Form.Field>
+                <label htmlFor="projects">Projects</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.projects === null
+                      ? 'Ow-Jek - Android Mobile Project'
+                      : this.state.projects
+                  }
+                  defaultValue={
+                    this.state.projects === null ? null : this.state.projects
+                  }
+                  name="projects"
+                />
+              </Form.Field>
+
+              <Form.Field>
+                <label htmlFor="volunteer">Volunteering Experience</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder="Ketua Organisasi A - 2020"
+                  name="volunteer"
+                />
+              </Form.Field>
+
+              <Form.Field>
+                <label htmlFor="seminar">Seminar dan Training</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.seminar === null
+                      ? 'Seminar CompFest'
+                      : this.state.seminar
+                  }
+                  defaultValue={
+                    this.state.seminar === null ? null : this.state.seminar
+                  }
+                  name="seminar"
+                />
+              </Form.Field>
+
+            </Form>
+          </Segment>
+
+          <Segment className="skills-form">
+            <Header as="h3" textAlign="center">
+              <Icon name="edit" />
+              <Header.Content>Edit Skills</Header.Content>
+            </Header>
+            <Form
+              ref={(input) => {
+                this.form = input;
+              }}
+              key={this.state.refresh}
+              size="small"
+            >
+              <Form.Field>
+                <label htmlFor="skills">Skills</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder="Isi sesuai dengan keahlian anda"
+                  defaultValue={this.state.skills === null ? 'Competitive Programming' : this.state.skills}
+                  name="skills"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="languages">Bahasa yang dikuasai</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.languages === null
+                      ? 'Indonesia'
+                      : this.state.languages
+                  }
+                  defaultValue={
+                    this.state.languages === null ? null : this.state.languages
+                  }
+                  name="languages"
+                />
+              </Form.Field>
+              <Form.Field>
+                <label htmlFor="certification">Sertifikasi</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.certification === null
+                      ? 'TOEFL'
+                      : this.state.certification
+                  }
+                  defaultValue={
+                    this.state.certification === null
+                      ? null
+                      : this.state.certification
+                  }
+                  name="certification"
+                />
+              </Form.Field>
+              <Form.Field>
                 <label htmlFor="student_toefl">TOEFL</label>
                 <input
                   onChange={this.handleChange}
@@ -481,259 +678,115 @@ export default class EditProfile extends React.Component {
                   type="File"
                 />
               </Form.Field>
+            </Form>
+          </Segment>
+
+          <Segment className="links-form">
+            <Header as="h3" textAlign="center">
+              <Icon name="edit" />
+              <Header.Content>Edit Links</Header.Content>
+            </Header>
+            <Form
+              ref={(input) => {
+                this.form = input;
+              }}
+              key={this.state.refresh}
+              size="small"
+              onSubmit={this.handleSubmit}
+            >
 
-            <Form.Field>
-              <label htmlFor="dependants">Dependants</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.dependants === null ? '0' : this.state.dependants
-                }
-                defaultValue={
-                  this.state.dependants === null ? null : this.state.dependants
-                }
-                name="dependants"
-              />
-            </Form.Field>
-          </Form>
-        </Segment>
-
-        <Segment className="links-form">
-          <Header as="h3" textAlign="center">
-            <Icon name="edit" />
-            <Header.Content>Edit Experience</Header.Content>
-          </Header>
-          <Form
-            ref={(input) => {
-              this.form = input;
-            }}
-            key={this.state.refresh}
-            size="small"
-            onSubmit={this.handleSubmit}
-          >
+              <Form.Field>
+                <label htmlFor="portfolio_link">Portfolio Link</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.portfolio_link === null
+                      ? 'https://www.example.com/myproject/'
+                      : this.state.portfolio_link
+                  }
+                  defaultValue={
+                    this.state.portfolio_link === null
+                      ? null
+                      : this.state.portfolio_link
+                  }
+                  name="portfolio_link"
+                />
+              </Form.Field>
 
-            <Form.Field>
-              <label htmlFor="latest_work">Latest Working Experience</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.latest_work === null
-                    ? 'Teaching Asssistant at Fasilkom UI'
-                    : this.state.latest_work
-                }
-                defaultValue={
-                  this.state.latest_work === null
-                    ? null
-                    : this.state.latest_work
-                }
-                name="latest_work"
-              />
-            </Form.Field>
-
-            <Form.Field>
-              <label htmlFor="latest_work_desc">
-                Latest Working Experience Description
-              </label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.latest_work_desc === null
-                    ? 'Evaluate weekly assignment for 15 students'
-                    : this.state.latest_work_desc
-                }
-                defaultValue={
-                  this.state.latest_work_desc === null
-                    ? null
-                    : this.state.latest_work_desc
-                }
-                name="latest_work_desc"
-              />
-            </Form.Field>
-
-            <Form.Field>
-              <label htmlFor="awards">Awards and Achievements</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.awards === null
-                    ? 'Juara 2 UIUX Gemastik 2019'
-                    : this.state.awards
-                }
-                defaultValue={
-                  this.state.awards === null ? null : this.state.awards
-                }
-                name="awards"
-              />
-            </Form.Field>
-
-            <Form.Field>
-              <label htmlFor="certification">Sertifikasi</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.certification === null
-                    ? 'TOEFL'
-                    : this.state.certification
-                }
-                defaultValue={
-                  this.state.certification === null
-                    ? null
-                    : this.state.certification
-                }
-                name="certification"
-              />
-            </Form.Field>
-
-            <Form.Field>
-              <label htmlFor="projects">Projects</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.projects === null
-                    ? 'Ow-Jek - Android Mobile Project'
-                    : this.state.projects
-                }
-                defaultValue={
-                  this.state.projects === null ? null : this.state.projects
-                }
-                name="projects"
-              />
-            </Form.Field>
-
-            <Form.Field>
-              <label htmlFor="volunteer">Volunteering Experience</label>
-              <input
-                onChange={this.handleChange}
-                placeholder="Ketua Organisasi A - 2020"
-                name="volunteer"
-              />
-            </Form.Field>
-
-            <Form.Field>
-              <label htmlFor="seminar">Seminar dan Training</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.seminar === null
-                    ? 'Seminar CompFest'
-                    : this.state.seminar
-                }
-                defaultValue={
-                  this.state.seminar === null ? null : this.state.seminar
-                }
-                name="seminar"
-              />
-            </Form.Field>
+              <Form.Field>
+                <label htmlFor="linkedin_url">URL Profile LinkedIn</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.linkedin_url === null
+                      ? 'https://www.linkedin.com/in/jojo/'
+                      : this.state.linkedin_url
+                  }
+                  defaultValue={
+                    this.state.linkedin_url === null
+                      ? null
+                      : this.state.linkedin_url
+                  }
+                  name="linkedin_url"
+                />
+              </Form.Field>
+
+              <Form.Field>
+                <label htmlFor="hackerrank_url">URL Profile Hackerrank</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.hackerrank_url === null
+                      ? 'https://www.hackerrank.com/james'
+                      : this.state.hackerrank_url
+                  }
+                  defaultValue={
+                    this.state.hackerrank_url === null
+                      ? null
+                      : this.state.hackerrank_url
+                  }
+                  name="hackerrank_url"
+                />
+              </Form.Field>
 
+              <Form.Field>
+                <label htmlFor="website_url">Website URL</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={
+                    this.state.website_url === null
+                      ? 'https://www.example.com/'
+                      : this.state.website_url
+                  }
+                  defaultValue={
+                    this.state.website_url === null
+                      ? null
+                      : this.state.website_url
+                  }
+                  name="website_url"
+                />
+              </Form.Field>
+
+              <Form.Field>
+                <label htmlFor="github_url">URL Profile Github</label>
+                <input
+                  onChange={this.handleChange}
+                  placeholder={this.state.github_url === null ? 'https://github.com/bob' : this.state.github_url}
+                  defaultValue={this.state.github_url === null ? null : this.state.github_url}
+                  name="github_url"
+                />
+              </Form.Field>
             </Form>
-        </Segment>
-
-
-        <Segment className="links-form">
-          <Header as="h3" textAlign="center">
-            <Icon name="edit" />
-            <Header.Content>Edit Links</Header.Content>
-          </Header>
-          <Form
-            ref={(input) => {
-              this.form = input;
-            }}
-            key={this.state.refresh}
+          </Segment>
+          <Button
+            onClick={this.handleSubmit}
+            fluid
+            type="submit"
             size="small"
-            onSubmit={this.handleSubmit}
+            loading={this.state.loading}
+            primary
           >
-
-          <Form.Field>
-              <label htmlFor="portfolio_link">Portfolio Link</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.portfolio_link === null
-                    ? 'https://www.example.com/myproject/'
-                    : this.state.portfolio_link
-                }
-                defaultValue={
-                  this.state.portfolio_link === null
-                    ? null
-                    : this.state.portfolio_link
-                }
-                name="portfolio_link"
-              />
-            </Form.Field>
-
-            <Form.Field>
-              <label htmlFor="linkedin_url">URL Profile LinkedIn</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.linkedin_url === null
-                    ? 'https://www.linkedin.com/in/jojo/'
-                    : this.state.linkedin_url
-                }
-                defaultValue={
-                  this.state.linkedin_url === null
-                    ? null
-                    : this.state.linkedin_url
-                }
-                name="linkedin_url"
-              />
-            </Form.Field>
-
-            <Form.Field>
-              <label htmlFor="hackerrank_url">URL Profile Hackerrank</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.hackerrank_url === null
-                    ? 'https://www.hackerrank.com/james'
-                    : this.state.hackerrank_url
-                }
-                defaultValue={
-                  this.state.hackerrank_url === null
-                    ? null
-                    : this.state.hackerrank_url
-                }
-                name="hackerrank_url"
-              />
-            </Form.Field>
-
-            <Form.Field>
-              <label htmlFor="website_url">Website URL</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={
-                  this.state.website_url === null
-                    ? 'https://www.example.com/'
-                    : this.state.website_url
-                }
-                defaultValue={
-                  this.state.website_url === null
-                    ? null
-                    : this.state.website_url
-                }
-                name="website_url"
-              />
-            </Form.Field>
-
-            <Form.Field>
-              <label htmlFor="github_url">URL Profile Github</label>
-              <input
-                onChange={this.handleChange}
-                placeholder={this.state.github_url === null ? 'https://github.com/bob' : this.state.github_url}
-                defaultValue={this.state.github_url === null ? null : this.state.github_url}
-                name="github_url"
-              />
-            </Form.Field>
-            </Form>
-        </Segment>
-        <Button onClick={this.handleSubmit}
-              fluid
-              type="submit"
-              size="small"
-              loading={this.state.loading}
-              primary
-            >
-              Submit
+            Submit
             </Button>
         </div>
       );
@@ -747,4 +800,4 @@ export default class EditProfile extends React.Component {
       <div className="profilePage">{this.updateForm(this.props.route.own)}</div>
     );
   }
-}
+}
\ No newline at end of file
diff --git a/assets/js/ProfilePage.jsx b/assets/js/ProfilePage.jsx
index 7f53f751262f48d630c34c767522897ca58b4178..005d984591625143f290d73001774d00618ccb51 100755
--- a/assets/js/ProfilePage.jsx
+++ b/assets/js/ProfilePage.jsx
@@ -94,7 +94,7 @@ export default class ProfilePage extends ProfileHandler {
       github_url: '',
       gitlab_url: '',
       awards: '',
-      sertifikat:'',
+      sertifikat: '',
       projects: '',
       certification: '',
       languages: '',
@@ -326,7 +326,7 @@ export default class ProfilePage extends ProfileHandler {
                         <p>
                           {' '}
                           {this.state.major || 'N/A'}
-,
+                          ,
                           {' '}
                           {this.state.batch || 'N/A'}
                           {' '}
@@ -387,7 +387,7 @@ export default class ProfilePage extends ProfileHandler {
                         <p>
                           {' '}
                           {this.state.cityOfBirth || 'N/A'}
-,
+                          ,
                           {' '}
                           {this.state.dateOfBirth || 'N/A'}
                           {' '}
@@ -425,21 +425,6 @@ export default class ProfilePage extends ProfileHandler {
                     </Grid>
                   </Segment>
 
-                  <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="pencil alternate" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <p href={this.state.student_toefl}>
-                          {' '}
-                          {this.state.student_toefl || 'N/A'}
-                          {' '}
-                        </p>
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
-
                   <Segment basic vertical>
                     <Grid>
                       <Grid.Column width={2}>
@@ -486,21 +471,6 @@ export default class ProfilePage extends ProfileHandler {
                       </Grid.Column>
                     </Grid>
                   </Segment>
-                  <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="cogs" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <p>
-                          {' '}
-                          {this.state.skills || 'Skills belum ditambahkan'}
-                          {' '}
-                        </p>
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
-
                   <Segment basic vertical>
                     <Grid>
                       <Grid.Column width={2}>
@@ -515,38 +485,6 @@ export default class ProfilePage extends ProfileHandler {
                       </Grid.Column>
                     </Grid>
                   </Segment>
-
-
-                  <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="certificate" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <p>
-                          {' '}
-                          {this.state.certification || 'N/A'}
-                          {' '}
-                        </p>
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
-
-                  <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="comment" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <p>
-                          {' '}
-                          {this.state.languages || 'N/A'}
-                          {' '}
-                        </p>
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
-
                   <Segment basic vertical>
                     <Grid>
                       <Grid.Column width={2}>
@@ -651,7 +589,7 @@ export default class ProfilePage extends ProfileHandler {
                 </Segment>
                 <Container textAlign="center">
                   <div className="buttonProfile">
-                  <Button
+                    <Button
                       onClick={this.gotoStudentToeflFile}
                       disabled={!this.state.student_toefl_file}
                       primary
@@ -708,238 +646,297 @@ export default class ProfilePage extends ProfileHandler {
                   </p>
                 </Message>
               ) : (
-                <Message negative>
-                  <Message.Header>Tidak mencari pekerjaan</Message.Header>
-                  <p>
+                  <Message negative>
+                    <Message.Header>Tidak mencari pekerjaan</Message.Header>
+                    <p>
                       Saya sedang tidak mencari pekerjaan. Mohon jangan kirimkan
                       informasi mengenai lowongan pekerjaan.
                   </p>
-                </Message>
-              )}
+                  </Message>
+                )}
             </h4>
           </div>
         </Segment>
 
-        <Segment className="links-form">
-            <h3>Experience</h3>
-            <Grid stackable>
+        <Segment className="experiences-form">
+          <h3>Experience</h3>
+          <Grid stackable>
             <Grid.Column width={6}>
               <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="suitcase" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <p>
-                          Latest working experience as:
-                          {' '}
-                          <span>
-                            <b>
-                              {' '}
-                              {this.state.latest_work || 'N/A'}
-                              {' '}
-                            </b>
-                          </span>
-                        </p>
-                        <p>
-                          Description:
-                          {' '}
-                          <span>
-                            {' '}
-                            {this.state.latest_work_desc || 'N/A'}
-                            {' '}
-                          </span>
-                        </p>
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
-
-                  <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="trophy" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <p>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="suitcase" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <p>
+                      Latest working experience as:
                           {' '}
-                          {this.state.awards || 'Awards belum ditambahkan'}
+                      <span>
+                        <b>
                           {' '}
-                        </p>
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
-
-                  <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="trophy" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        {sertifikat_state}
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
-
-                  <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="folder open" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <p>
+                          {this.state.latest_work || 'N/A'}
                           {' '}
-                          {this.state.projects
-                            || 'Projects belum ditambahkan'}
+                        </b>
+                      </span>
+                    </p>
+                    <p>
+                      Description:
                           {' '}
-                        </p>
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
+                      <span>
+                        {' '}
+                        {this.state.latest_work_desc || 'N/A'}
+                        {' '}
+                      </span>
+                    </p>
+                  </Grid.Column>
+                </Grid>
+              </Segment>
 
-                  <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="hand peace outline" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <p>
-                          {' '}
-                          {this.state.volunteer || 'N/A'}
-                          {' '}
-                        </p>
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="trophy" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <p>
+                      {' '}
+                      {this.state.awards || 'Awards belum ditambahkan'}
+                      {' '}
+                    </p>
+                  </Grid.Column>
+                </Grid>
+              </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="trophy" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    {sertifikat_state}
+                  </Grid.Column>
+                </Grid>
+              </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="folder open" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <p>
+                      {' '}
+                      {this.state.projects
+                        || 'Projects belum ditambahkan'}
+                      {' '}
+                    </p>
+                  </Grid.Column>
+                </Grid>
+              </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="hand peace outline" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <p>
+                      {' '}
+                      {this.state.volunteer || 'N/A'}
+                      {' '}
+                    </p>
+                  </Grid.Column>
+                </Grid>
+              </Segment>
 
-                  <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="slideshare" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <p>
-                          {' '}
-                          {this.state.seminar
-                            || 'Seminar dan Training kosong'}
-                          {' '}
-                        </p>
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="slideshare" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <p>
+                      {' '}
+                      {this.state.seminar
+                        || 'Seminar dan Training kosong'}
+                      {' '}
+                    </p>
                   </Grid.Column>
+                </Grid>
+              </Segment>
+            </Grid.Column>
           </Grid>
         </Segment>
 
-
+        <Segment className="skills-form">
+          <h3>Skills</h3>
+          <Grid stackable>
+            <Grid.Column width={6}>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="cogs" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <p>
+                      {' '}
+                      {this.state.skills || 'Skills belum ditambahkan'}
+                      {' '}
+                    </p>
+                  </Grid.Column>
+                </Grid>
+              </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="comment" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <p>
+                      {' '}
+                      {this.state.languages || 'N/A'}
+                      {' '}
+                    </p>
+                  </Grid.Column>
+                </Grid>
+              </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="certificate" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <p>
+                      {' '}
+                      {this.state.certification || 'N/A'}
+                      {' '}
+                    </p>
+                  </Grid.Column>
+                </Grid>
+              </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="pencil alternate" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <p href={this.state.student_toefl}>
+                      {' '}
+                      {this.state.student_toefl || 'N/A'}
+                      {' '}
+                    </p>
+                  </Grid.Column>
+                </Grid>
+              </Segment>
+            </Grid.Column>
+          </Grid>
+        </Segment>
 
         <Segment className="links-form">
           <h3>Links</h3>
           <Grid stackable>
             <Grid.Column width={6}>
-            <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="linkify" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <a href={this.state.portfolio_link}>
-                          {' '}
-                          {this.state.portfolio_link || 'Portofolio belum ditambahkan'}
-                          {' '}
-                        </a>
-                      </Grid.Column>
-                    </Grid>
-          </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="linkify" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <a href={this.state.portfolio_link}>
+                      {' '}
+                      {this.state.portfolio_link || 'Portofolio belum ditambahkan'}
+                      {' '}
+                    </a>
+                  </Grid.Column>
+                </Grid>
+              </Segment>
 
-          <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="linkedin" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <a href={this.state.linkedin_url}>
-                          {' '}
-                          {this.state.linkedin_url || 'N/A'}
-                          {' '}
-                        </a>
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="linkedin" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <a href={this.state.linkedin_url}>
+                      {' '}
+                      {this.state.linkedin_url || 'N/A'}
+                      {' '}
+                    </a>
+                  </Grid.Column>
+                </Grid>
+              </Segment>
 
-        <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="hackerrank" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <a href={this.state.hackerrank_url}>
-                          {' '}
-                          {this.state.hackerrank_url || 'N/A'}
-                          {' '}
-                        </a>
-                      </Grid.Column>
-                    </Grid>
-        </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="hackerrank" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <a href={this.state.hackerrank_url}>
+                      {' '}
+                      {this.state.hackerrank_url || 'N/A'}
+                      {' '}
+                    </a>
+                  </Grid.Column>
+                </Grid>
+              </Segment>
 
-        <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="globe" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        <a href={this.state.website_url}>
-                          {' '}
-                          {this.state.website_url || 'N/A'}
-                          {' '}
-                        </a>
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="globe" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    <a href={this.state.website_url}>
+                      {' '}
+                      {this.state.website_url || 'N/A'}
+                      {' '}
+                    </a>
+                  </Grid.Column>
+                </Grid>
+              </Segment>
 
-                  <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="github" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        {this.state.github_url ? (
-                          <a href={this.state.github_url}>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="github" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    {this.state.github_url ? (
+                      <a href={this.state.github_url}>
+                        {' '}
+                        {this.state.github_url}
+                        {' '}
+                      </a>
+                    ) : (
+                        <p> N/A </p>
+                      )}
+                  </Grid.Column>
+                </Grid>
+              </Segment>
+              <Segment basic vertical>
+                <Grid>
+                  <Grid.Column width={2}>
+                    <Icon name="gitlab" size="big" />
+                  </Grid.Column>
+                  <Grid.Column width={13}>
+                    {
+                      this.state.gitlab_url
+                        ? (
+                          <a href={this.state.gitlab_url}>
                             {' '}
-                            {this.state.github_url}
+                            {this.state.gitlab_url}
                             {' '}
                           </a>
-                        ) : (
-                          <p> N/A </p>
-                        )}
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
-                  <Segment basic vertical>
-                    <Grid>
-                      <Grid.Column width={2}>
-                        <Icon name="gitlab" size="big" />
-                      </Grid.Column>
-                      <Grid.Column width={13}>
-                        {
-                          this.state.gitlab_url
-                            ? (
-                              <a href={this.state.gitlab_url}>
-                                {' '}
-                                { this.state.gitlab_url }
-                                {' '}
-                              </a>
-                            )
-                            : <p> N/A </p>
-                        }
-                      </Grid.Column>
-                    </Grid>
-                  </Segment>
+                        )
+                        : <p> N/A </p>
+                    }
+                  </Grid.Column>
+                </Grid>
+              </Segment>
             </Grid.Column>
           </Grid>
         </Segment>
 
         {/* { this.updateForm(this.props.route.own) } */}
-      </div>
+      </div >
     );
   }
 }