Index: client_app/src/components/data/components/user_profile.js
===================================================================
--- client_app/src/components/data/components/user_profile.js	(revision 17abe5eb95d30a27747b54273b41e7dbfc9e3c94)
+++ client_app/src/components/data/components/user_profile.js	(revision 6f9b7b0be231e798aeb85cf2cc534fec8a49bf74)
@@ -1,7 +1,34 @@
 import React from 'react';
+import { Container, Header, List } from 'semantic-ui-react'
 
 const UserDetails = (props) =>{
     return(
-        
+        <Container>
+            <Header>Welcome</Header>
+            <br />
+            <h3>User: {props.data.name}</h3>
+            <table>
+                <tr>
+                    <td>
+                        <h3>Retained skills</h3>
+                        <ul>
+                        {props.data.retained.map((value, index) => {
+                            return <li key={index}>{value.name}</li>
+                        })}
+                        </ul>
+                    </td>
+                    <td>
+                        <h3>Skills you want to learn</h3>
+                        <ul>
+                            {props.data.toLearn.map((value, index) => {
+                                return <li key={index}>{value.name}</li>
+                            })}
+                        </ul>
+                    </td>
+                </tr>
+            </table>
+        </Container>
     );
 }
+
+export default UserDetails;
Index: client_app/src/components/data/profile.js
===================================================================
--- client_app/src/components/data/profile.js	(revision 17abe5eb95d30a27747b54273b41e7dbfc9e3c94)
+++ client_app/src/components/data/profile.js	(revision 6f9b7b0be231e798aeb85cf2cc534fec8a49bf74)
@@ -1,18 +1,22 @@
 import React from 'react';
-import {useHistory} from 'react-router-dom';
-import {render} from "@testing-library/react";
+import UserDetails from "./components/user_profile";
+import { Redirect } from "react-router-dom";
 
 const Profile = (props) => {
-    const history = useHistory();
-    const userProfile = React.useState({
-        userProfile: props.userProfile
-    });
 
-    if(props.userProfile.email==null){
-        history.push("/");
+    if(props.userProfile.type==="USER"){
+        return (
+          <UserDetails data={{
+               email: props.userProfile.email,
+               name: props.userProfile.name,
+               surname: props.userProfile.surname,
+               retained: props.userProfile.retained,
+               toLearn: props.userProfile.toLearn
+          }}/>
+        );
     }
 
     return(
-        <h1>?</h1>
+        <Redirect to={"/login"}/>
     );
 }
Index: client_app/src/components/login/login.js
===================================================================
--- client_app/src/components/login/login.js	(revision 17abe5eb95d30a27747b54273b41e7dbfc9e3c94)
+++ client_app/src/components/login/login.js	(revision 6f9b7b0be231e798aeb85cf2cc534fec8a49bf74)
@@ -1,8 +1,7 @@
 import React from 'react';
-import {useHistory} from 'react-router-dom';
-import {Button, Checkbox, Container, Form} from "semantic-ui-react";
+import { Button, Checkbox, Container, Form } from "semantic-ui-react";
+import { Redirect } from 'react-router-dom';
 
 const Login = (props) => {
-    const history = useHistory();
     const [formData, updateFormData] = React.useState({
         email: "",
@@ -25,46 +24,53 @@
 
         props.onCompleteForm(email,password,type);
-        history.push("/");
+    }
+
+    if(!props.loggedIn){
+        return(
+            <Container>
+                <h1 style={{color: "red"}}>{props.error}</h1>
+                <Form onSubmit={onFormSubmit}>
+                    <Form.Input id="email" name="email" type='text' required fluid label='E-mail' placeholder='Enter e-mail.' onChange={handleCheck} />
+                    <Form.Input id="password" name="password" type='password' required fluid label='Password' placeholder='Enter password.' onChange={handleCheck} />
+                    <Form.Field
+                        control={Checkbox}
+                        radio
+                        label='User'
+                        id="0"
+                        name="type"
+                        value="0"
+                        checked={formData.type === "0"}
+                        onChange={handleCheck}
+                    />
+                    <Form.Field
+                        control={Checkbox}
+                        radio
+                        label='Team'
+                        id="1"
+                        name="type"
+                        value="1"
+                        checked={formData.type === "1"}
+                        onChange={handleCheck}
+                    />
+                    <Form.Field
+                        control={Checkbox}
+                        radio
+                        label='Company'
+                        id="2"
+                        name="type"
+                        value="2"
+                        checked={formData.type === "2"}
+                        onChange={handleCheck}
+                    />
+                    <Form.Field control={Button}>LogIn</Form.Field>
+                </Form>
+            </Container>
+        );
     }
 
     return(
-        <Container>
-            <Form onSubmit={onFormSubmit}>
-                <Form.Input id="email" name="email" type='text' required fluid label='E-mail' placeholder='Enter e-mail.' onChange={handleCheck} />
-                <Form.Input id="password" name="password" type='password' required fluid label='Password' placeholder='Enter password.' onChange={handleCheck} />
-                <Form.Field
-                    control={Checkbox}
-                    radio
-                    label='User'
-                    id="0"
-                    name="type"
-                    value="0"
-                    checked={formData.type === "0"}
-                    onChange={handleCheck}
-                />
-                <Form.Field
-                    control={Checkbox}
-                    radio
-                    label='Team'
-                    id="1"
-                    name="type"
-                    value="1"
-                    checked={formData.type === "1"}
-                    onChange={handleCheck}
-                />
-                <Form.Field
-                    control={Checkbox}
-                    radio
-                    label='Company'
-                    id="2"
-                    name="type"
-                    value="2"
-                    checked={formData.type === "2"}
-                    onChange={handleCheck}
-                />
-                <Form.Field control={Button}>LogIn</Form.Field>
-            </Form>
-        </Container>
+        <Redirect to={"/profile"}/>
     );
+
 }
 
Index: client_app/src/components/main/App.js
===================================================================
--- client_app/src/components/main/App.js	(revision 17abe5eb95d30a27747b54273b41e7dbfc9e3c94)
+++ client_app/src/components/main/App.js	(revision 6f9b7b0be231e798aeb85cf2cc534fec8a49bf74)
@@ -1,4 +1,4 @@
 import React, {Component} from 'react';
-import {BrowserRouter as Router, Route} from 'react-router-dom';
+import {BrowserRouter as Router, Route, Redirect} from 'react-router-dom';
 import Login from '../login/login';
 import Profile from "../data/profile";
@@ -12,31 +12,43 @@
     super(props);
     this.state = {
-      currentUser: {}
+        logged: false,
+        error: null,
+        currentUser: {}
     }
   }
 
   render(){
-      return(
-          <Router>
-              <HeaderComp acc={this.state.currentUser.email} accType={this.state.currentUser.type} name={this.state.currentUser.name}/>
-              <main>
-                  <Route path={"/login"} render={() => <Login onCompleteForm={this.attemptLogin}/>}/>
-                  <Route path={"/profile"} render={() => <Profile userProfile={this.state.currentUser}/>}/>
-                  <Route path={"/"}/>
-                  <Route path={"/jobs"}/>
-                  <Route path={"/internships"}/>
-              </main>
-          </Router>
-      );
+          return(
+              <Router>
+                  <HeaderComp acc={this.state.currentUser.email} accType={this.state.currentUser.type} name={this.state.currentUser.name}/>
+                  <main>
+                      <Route path={"/login"} render={() => <Login error={this.state.error} onCompleteForm={this.attemptLogin} loggedIn={this.state.logged}/>}/>
+                      <Route path={"/profile"} render={() => <Profile userProfile={this.state.currentUser}/>}/>
+                      <Route path={"/"} render={() => <Redirect to={"/login"}/>}/>
+                  </main>
+              </Router>
+          );
   }
 
   attemptLogin = (email, password, type) => {
-
       UserLogin.login(email, password, type).then((res) =>{
           console.log(res.data);
-          this.setState({
-              currentUser: res.data
-          });
+          if(res.data.email==null){
+              this.setState({
+                  logged: false,
+                  error: res.data.error,
+              });
+          }else{
+              this.setState({
+                  logged: true,
+                  currentUser: res.data,
+                  error: null,
+              });
+          }
       });
+
+      if(this.state.currentUser.email!=null){
+          return <Redirect to={"/profile"}/>;
+      }
   }
 }
Index: client_app/src/components/template/header.js
===================================================================
--- client_app/src/components/template/header.js	(revision 17abe5eb95d30a27747b54273b41e7dbfc9e3c94)
+++ client_app/src/components/template/header.js	(revision 6f9b7b0be231e798aeb85cf2cc534fec8a49bf74)
@@ -54,4 +54,10 @@
                         Internships
                     </Menu.Item>
+                    <Menu.Item as={Link} to='/projects'>
+                        Projects
+                    </Menu.Item>
+                    <Menu.Item as={Link} to='/search'>
+                        Search
+                    </Menu.Item>
                 </Menu>
             );