diff --git a/src/main/java/org/hbp/mip/controllers/ModelsApi.java b/src/main/java/org/hbp/mip/controllers/ModelsApi.java
index ac03b988eb09b5f047721eb32dfa97d2e3997068..3adee3a74426fa61a546b8f1f086531145db146c 100644
--- a/src/main/java/org/hbp/mip/controllers/ModelsApi.java
+++ b/src/main/java/org/hbp/mip/controllers/ModelsApi.java
@@ -7,6 +7,7 @@ package org.hbp.mip.controllers;
 
 import io.swagger.annotations.*;
 import org.hbp.mip.model.Model;
+import org.hibernate.Query;
 import org.hibernate.Session;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -34,9 +35,29 @@ public class ModelsApi {
             @ApiParam(value = "Only ask own models") @RequestParam(value = "own", required = false) Boolean own,
             @ApiParam(value = "Only ask models from own team") @RequestParam(value = "team", required = false) Boolean team,
             @ApiParam(value = "Only ask valid models") @RequestParam(value = "valid", required = false) Boolean valid) throws NotFoundException {
+
+        String queryString = "from Model m, User u where m.createdBy=u.id";
+
+        if(own != null)
+        {
+            if(own)
+            {
+                queryString += " and u.username= :username";
+            }
+            else
+            {
+                queryString += " and u.username!= :username";
+            }
+        }
+
         Session session = HibernateUtil.getSessionFactory().getCurrentSession();
         session.beginTransaction();
-        List<Model> models = session.createQuery("from Model").list();
+        Query query = session.createQuery(queryString);
+        if(own != null)
+        {
+            query.setString("username", "nasuti");
+        }
+        List<Model> models = query.list();
         session.getTransaction().commit();
         return new ResponseEntity<List<Model>>(HttpStatus.OK).ok(models);
     }
diff --git a/src/main/java/org/hbp/mip/controllers/RequestsApi.java b/src/main/java/org/hbp/mip/controllers/RequestsApi.java
new file mode 100644
index 0000000000000000000000000000000000000000..15d5bf398bf71873d927b830508e14491bc9944a
--- /dev/null
+++ b/src/main/java/org/hbp/mip/controllers/RequestsApi.java
@@ -0,0 +1,46 @@
+package org.hbp.mip.controllers;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiResponse;
+import io.swagger.annotations.ApiResponses;
+import org.hbp.mip.model.Group;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
+
+/**
+ * Created by mirco on 18.01.16.
+ */
+@Controller
+@RequestMapping(value = "/queries/requests", produces = {APPLICATION_JSON_VALUE})
+@Api(value = "/queries/requests", description = "the groups API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.SpringMVCServerCodegen", date = "2016-01-07T07:38:20.227Z")
+public class RequestsApi {
+
+    private static String RESPONSE_SRC = "/home/mirco/Workspace/GitLab/mip/target/classes/data/requestExample.json";
+
+    @ApiOperation(value = "", notes = "", response = Group.class)
+    @ApiResponses(value = {
+            @ApiResponse(code = 200, message = "Success")})
+    @RequestMapping(value = "", produces = {"application/json"}, method = RequestMethod.POST)
+    public ResponseEntity<String> postRequests() throws NotFoundException {
+        // Read data from file
+        String response = "";
+        try {
+            response = new String(Files.readAllBytes(Paths.get(RESPONSE_SRC)));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return new ResponseEntity<Group>(HttpStatus.OK).ok(response);
+    }
+
+}
diff --git a/src/main/java/org/hbp/mip/controllers/UsersApi.java b/src/main/java/org/hbp/mip/controllers/UsersApi.java
index 2ec81564f8aa6ff913c71040ac64a4f5f593b2a6..9b9d4b01dabe986f73d332f27db2046668e7774b 100644
--- a/src/main/java/org/hbp/mip/controllers/UsersApi.java
+++ b/src/main/java/org/hbp/mip/controllers/UsersApi.java
@@ -26,13 +26,13 @@ public class UsersApi {
     @ApiResponses(value = {
             @ApiResponse(code = 200, message = "Found"),
             @ApiResponse(code = 404, message = "Not found")})
-    @RequestMapping(value = "/{id}", produces = {"application/json"}, method = RequestMethod.GET)
+    @RequestMapping(value = "/{username}", produces = {"application/json"}, method = RequestMethod.GET)
     public ResponseEntity<User> getAUser(
-            @ApiParam(value = "id", required = true) @PathVariable("id") Long id) throws NotFoundException {
+            @ApiParam(value = "username", required = true) @PathVariable("username") String username) throws NotFoundException {
         Session session = HibernateUtil.getSessionFactory().getCurrentSession();
         session.beginTransaction();
-        org.hibernate.Query query = session.createQuery("from User where id= :id");
-        query.setLong("id", id);
+        org.hibernate.Query query = session.createQuery("from User where username= :username");
+        query.setString("username", username);
         User user = (User) query.uniqueResult();
         session.getTransaction().commit();
         return new ResponseEntity<User>(HttpStatus.OK).ok(user);
diff --git a/src/main/java/org/hbp/mip/model/Article.java b/src/main/java/org/hbp/mip/model/Article.java
index 20b2ff706b12e2019e000c5e6dced1b0afb13071..386d317eb018a2697e2fc0aea2873e424872d428 100644
--- a/src/main/java/org/hbp/mip/model/Article.java
+++ b/src/main/java/org/hbp/mip/model/Article.java
@@ -23,13 +23,9 @@ import java.util.List;
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 public class Article {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id = null;
-    private String status = null;
-    @Column(unique = true)
-    private String title = null;
-    @Column(unique = true)
     private String slug = null;
+    private String title = null;
+    private String status = null;
     private String _abstract = null;
     private String content = null;
     private Date publishedAt = null;
@@ -39,25 +35,12 @@ public class Article {
     private User createdBy = null;
     @ManyToOne
     private User updatedBy = null;
-    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
+    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
     private List<Tag> tags = new LinkedList<Tag>();
 
     public Article() {
     }
 
-    /**
-     * Unique identifier
-     **/
-    @ApiModelProperty(value = "Unique identifier")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     /**
      * Status
      **/
@@ -205,7 +188,6 @@ public class Article {
         StringBuilder sb = new StringBuilder();
         sb.append("class Article {\n");
 
-        sb.append("  id: ").append(id).append("\n");
         sb.append("  status: ").append(status).append("\n");
         sb.append("  title: ").append(title).append("\n");
         sb.append("  slug: ").append(slug).append("\n");
diff --git a/src/main/java/org/hbp/mip/model/Chart.java b/src/main/java/org/hbp/mip/model/Chart.java
index 3732c255ed6df0d3255d06e16c6b2c005bf4fb10..0116eb933ec786ac259ad881e86d2672ccdaff97 100644
--- a/src/main/java/org/hbp/mip/model/Chart.java
+++ b/src/main/java/org/hbp/mip/model/Chart.java
@@ -26,7 +26,7 @@ public class Chart {
     private Long id = null;
     private String chartType = null;
     private String xAxis = null;
-    @ManyToMany
+    @ManyToMany(cascade = CascadeType.ALL)
     private List<ChartConfigSet> chartConfigSets = new LinkedList<ChartConfigSet>();
 
     public Chart() {
diff --git a/src/main/java/org/hbp/mip/model/ChartConfigSet.java b/src/main/java/org/hbp/mip/model/ChartConfigSet.java
index f98836d492d941b24d0ae64c116d9bc23fd2e471..5f58639f22fea3e5d5f7428fb064debc75ff9fc0 100644
--- a/src/main/java/org/hbp/mip/model/ChartConfigSet.java
+++ b/src/main/java/org/hbp/mip/model/ChartConfigSet.java
@@ -20,9 +20,6 @@ import javax.persistence.*;
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 public class ChartConfigSet {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id = null;
-    @Column(unique = true)
     private String code = null;
     private String label = null;
     private String color = null;
@@ -30,19 +27,6 @@ public class ChartConfigSet {
     public ChartConfigSet() {
     }
 
-    /**
-     * Unique identifier
-     **/
-    @ApiModelProperty(value = "Unique identifier")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     /**
      * Code
      **/
@@ -88,7 +72,6 @@ public class ChartConfigSet {
         StringBuilder sb = new StringBuilder();
         sb.append("class ChartConfigSet {\n");
 
-        sb.append("  id: ").append(id).append("\n");
         sb.append("  code: ").append(code).append("\n");
         sb.append("  label: ").append(label).append("\n");
         sb.append("  color: ").append(color).append("\n");
diff --git a/src/main/java/org/hbp/mip/model/Dataset.java b/src/main/java/org/hbp/mip/model/Dataset.java
index 3a4591d1917c8ce6c2a956ef28923297f8cf4df7..ef2a37c7f5e1c7580ceca0aa9ecac928b824c9b5 100644
--- a/src/main/java/org/hbp/mip/model/Dataset.java
+++ b/src/main/java/org/hbp/mip/model/Dataset.java
@@ -23,9 +23,6 @@ import java.util.List;
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 public class Dataset {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id = null;
-    @Column(unique = true)
     private String code = null;
     private Date date = null;
     @ElementCollection
@@ -34,19 +31,6 @@ public class Dataset {
     public Dataset() {
     }
 
-    /**
-     * Unique identifier
-     **/
-    @ApiModelProperty(value = "Unique identifier")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     /**
      * Code
      **/
@@ -92,7 +76,6 @@ public class Dataset {
         StringBuilder sb = new StringBuilder();
         sb.append("class Dataset {\n");
 
-        sb.append("  id: ").append(id).append("\n");
         sb.append("  code: ").append(code).append("\n");
         sb.append("  date: ").append(date).append("\n");
         sb.append("  header: ").append(header).append("\n");
diff --git a/src/main/java/org/hbp/mip/model/Group.java b/src/main/java/org/hbp/mip/model/Group.java
index d2b6348b098348de2db4c77260ac9a30d2484669..b8f9bf994c115a1c7e5db9f40d4848d12895a0d8 100644
--- a/src/main/java/org/hbp/mip/model/Group.java
+++ b/src/main/java/org/hbp/mip/model/Group.java
@@ -22,9 +22,6 @@ import java.util.List;
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 public class Group {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id = null;
-    @Column(unique = true)
     private String code = null;
     private String label = null;
     @OneToMany(fetch = FetchType.EAGER, cascade = CascadeType.ALL)
@@ -33,19 +30,6 @@ public class Group {
     public Group() {
     }
 
-    /**
-     * Unique identifier
-     **/
-    @ApiModelProperty(value = "Unique identifier")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     /**
      * Code
      **/
@@ -90,7 +74,6 @@ public class Group {
         StringBuilder sb = new StringBuilder();
         sb.append("class Group {\n");
 
-        sb.append("  id: ").append(id).append("\n");
         sb.append("  code: ").append(code).append("\n");
         sb.append("  label: ").append(label).append("\n");
         sb.append("  groups: ").append(groups).append("\n");
diff --git a/src/main/java/org/hbp/mip/model/Model.java b/src/main/java/org/hbp/mip/model/Model.java
index bec3eb9df9f277a469e2e665ddfc3b609833154a..43a4e121637c501d7ad39ee564ef128259e2f3f6 100644
--- a/src/main/java/org/hbp/mip/model/Model.java
+++ b/src/main/java/org/hbp/mip/model/Model.java
@@ -21,22 +21,18 @@ import java.util.Date;
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 public class Model {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id = null;
-    @Column(unique = true)
-    private String title = null;
-    @Column(unique = true)
     private String slug = null;
+    private String title = null;
     private String description = null;
-    @ManyToOne
-    private Query query = null;
-    @ManyToOne
-    private Dataset dataset = null;
     private Boolean valid = null;
-    @ManyToOne
-    private Chart chart = null;
     private Date createdAt = null;
     private Date updatedAt = null;
+    @ManyToOne(cascade = CascadeType.PERSIST)
+    private Query query = null;
+    @ManyToOne(cascade = CascadeType.PERSIST)
+    private Dataset dataset = null;
+    @ManyToOne(cascade = CascadeType.PERSIST)
+    private Chart chart = null;
     @ManyToOne
     private User createdBy = null;
     @ManyToOne
@@ -45,19 +41,6 @@ public class Model {
     public Model() {
     }
 
-    /**
-     * Unique identifier
-     **/
-    @ApiModelProperty(value = "Unique identifier")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     /**
      * Title
      **/
@@ -206,7 +189,6 @@ public class Model {
         StringBuilder sb = new StringBuilder();
         sb.append("class Model {\n");
 
-        sb.append("  id: ").append(id).append("\n");
         sb.append("  title: ").append(title).append("\n");
         sb.append("  slug: ").append(slug).append("\n");
         sb.append("  description: ").append(description).append("\n");
diff --git a/src/main/java/org/hbp/mip/model/Query.java b/src/main/java/org/hbp/mip/model/Query.java
index bc29b8c576fc6b59aae24a6acc66e8379255a372..4444555d820078115c1055ff4a206be8b52018df 100644
--- a/src/main/java/org/hbp/mip/model/Query.java
+++ b/src/main/java/org/hbp/mip/model/Query.java
@@ -24,15 +24,15 @@ public class Query {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id = null;
-    @ManyToMany
+    private String request = null;
+    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
     private List<Variable> variables = new LinkedList<Variable>();
-    @ManyToMany
+    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
     private List<Variable> covariables = new LinkedList<Variable>();
-    @ManyToMany
+    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
     private List<Variable> grouping = new LinkedList<Variable>();
-    @ManyToMany
+    @ManyToMany(fetch = FetchType.EAGER, cascade = CascadeType.PERSIST)
     private List<Filter> filters = new LinkedList<Filter>();
-    private String request = null;
 
     public Query() {
     }
diff --git a/src/main/java/org/hbp/mip/model/Tag.java b/src/main/java/org/hbp/mip/model/Tag.java
index 14adacc214b500c3f6b8de02abcbee39acc54fcf..d3d772fd03e9bbf12720c6f48f42917196b6a846 100644
--- a/src/main/java/org/hbp/mip/model/Tag.java
+++ b/src/main/java/org/hbp/mip/model/Tag.java
@@ -20,9 +20,6 @@ import javax.persistence.*;
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 public class Tag {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id = null;
-    @Column(unique = true)
     private String name = null;
 
     public Tag() {
@@ -31,7 +28,7 @@ public class Tag {
     /**
      * Unique identifier
      **/
-    @ApiModelProperty(value = "Unique identifier")
+    /*@ApiModelProperty(value = "Unique identifier")
     @JsonProperty("id")
     public Long getId() {
         return id;
@@ -39,7 +36,7 @@ public class Tag {
 
     public void setId(Long id) {
         this.id = id;
-    }
+    }*/
 
     /**
      * Name
@@ -59,7 +56,7 @@ public class Tag {
         StringBuilder sb = new StringBuilder();
         sb.append("class Tag {\n");
 
-        sb.append("  id: ").append(id).append("\n");
+        //sb.append("  id: ").append(id).append("\n");
         sb.append("  name: ").append(name).append("\n");
         sb.append("}\n");
         return sb.toString();
diff --git a/src/main/java/org/hbp/mip/model/User.java b/src/main/java/org/hbp/mip/model/User.java
index e2023cc27de8eb6d235c92a3cc6cb6cea0af35e1..42613acd6c5b57b20301d46d91365a1e56d7b176 100644
--- a/src/main/java/org/hbp/mip/model/User.java
+++ b/src/main/java/org/hbp/mip/model/User.java
@@ -22,11 +22,8 @@ import java.util.regex.Pattern;
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 public class User {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id = null;
-    private String fullname = null;
-    @Column(unique = true)
     private String username = null;
+    private String fullname = null;
     private String firstname = null;
     private String lastname = null;
     private String picture = null;
@@ -107,19 +104,6 @@ public class User {
 
     }
 
-    /**
-     * Unique identifier
-     **/
-    @ApiModelProperty(value = "Unique identifier")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     /**
      * Fullname
      **/
@@ -359,7 +343,6 @@ public class User {
         StringBuilder sb = new StringBuilder();
         sb.append("class User {\n");
 
-        sb.append("  id: ").append(id).append("\n");
         sb.append("  fullname: ").append(fullname).append("\n");
         sb.append("  username: ").append(username).append("\n");
         sb.append("  firstname: ").append(firstname).append("\n");
diff --git a/src/main/java/org/hbp/mip/model/Value.java b/src/main/java/org/hbp/mip/model/Value.java
index cbca0c7d90da7b29ffaa248bfd9031f3a6db6d2f..276637e1420d01a1fcce8564ac29c86523eeb0ad 100644
--- a/src/main/java/org/hbp/mip/model/Value.java
+++ b/src/main/java/org/hbp/mip/model/Value.java
@@ -19,28 +19,12 @@ import javax.persistence.*;
 @JsonIgnoreProperties(value = { "id" })
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 public class Value {
+
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id = null;
-    @Column(unique = true)
     private String code = null;
     private String label = null;
 
 
-    /**
-     * Unique identifier
-     **/
-    @ApiModelProperty(value = "Unique identifier")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
     /**
      * Code
      **/
@@ -74,7 +58,6 @@ public class Value {
         StringBuilder sb = new StringBuilder();
         sb.append("class Value {\n");
 
-        sb.append("  id: ").append(id).append("\n");
         sb.append("  code: ").append(code).append("\n");
         sb.append("  label: ").append(label).append("\n");
         sb.append("}\n");
diff --git a/src/main/java/org/hbp/mip/model/Variable.java b/src/main/java/org/hbp/mip/model/Variable.java
index 6e789acb0ae2a50b0c92ab804c649c4700cbad14..3050f60c8ebc0f6ca2d17f0198d60219dde8db37 100644
--- a/src/main/java/org/hbp/mip/model/Variable.java
+++ b/src/main/java/org/hbp/mip/model/Variable.java
@@ -21,10 +21,8 @@ import java.util.List;
 @JsonIgnoreProperties(value = { "id", "idxPathGrp" })
 @JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
 public class Variable {
+
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id = null;
-    @Column(unique = true)
     private String code = null;
     private String label = null;
     private String type = null;
@@ -45,19 +43,6 @@ public class Variable {
     public Variable() {
     }
 
-    /**
-     * Unique identifier
-     **/
-    @ApiModelProperty(value = "Unique identifier")
-    @JsonProperty("id")
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     /**
      * Group
      **/
@@ -244,7 +229,6 @@ public class Variable {
         StringBuilder sb = new StringBuilder();
         sb.append("class Variable {\n");
 
-        sb.append("  id: ").append(id).append("\n");
         sb.append("  group: ").append(group).append("\n");
         sb.append("  code: ").append(code).append("\n");
         sb.append("  label: ").append(label).append("\n");
diff --git a/src/main/resources/data/requestExample.json b/src/main/resources/data/requestExample.json
new file mode 100644
index 0000000000000000000000000000000000000000..f7b62484ec5f07fb3186b10b69f72b60e959abfd
--- /dev/null
+++ b/src/main/resources/data/requestExample.json
@@ -0,0 +1,23 @@
+{
+    "code": "ib8ehpl4ic8cc0oc480w84w00cg4g0",
+    "date": "2016-01-18T13:56:14+0100",
+    "header": [
+        "MidTemp"
+    ],
+    "data": {
+        "MidTemp": [
+            18422,
+            16972,
+            17330,
+            16398,
+            21614,
+            21386,
+            20474,
+            19867,
+            20398,
+            19741,
+            18595,
+            18018
+        ]
+    }
+}
diff --git a/src/main/resources/static/frontend/app/scripts/app/articles/articles.html b/src/main/resources/static/frontend/app/scripts/app/articles/articles.html
index c1b7a32c83bdaf320714d4e4d219e9eaf2cc0244..7965361835384ab8eb3403a6e72eb4ad09043a8e 100644
--- a/src/main/resources/static/frontend/app/scripts/app/articles/articles.html
+++ b/src/main/resources/static/frontend/app/scripts/app/articles/articles.html
@@ -16,10 +16,10 @@
                     <div class="timeline-content">
                         <a href="" ng-click="showModal(article)" class="name">{{article.title}}</a>
                         <div class="author-box">
-                            <a href="{{'#/users/' + article.createdBy.id }}" class="avatar">
+                            <a href="{{'#/users/' + article.createdBy.username }}" class="avatar">
                                 <img ng-src="{{article.createdBy.picture}}" alt="" class="avatar" />
                             </a>
-                            by <a href="{{'#/users/' + article.createdBy.id }}">{{article.createdBy.fullname}}</a><br />
+                            by <a href="{{'#/users/' + article.createdBy.username }}">{{article.createdBy.fullname}}</a><br />
                             <span class="time">{{article.createdAt | fromNow}}</span>
                         </div>
                     </div>
diff --git a/src/main/resources/static/frontend/app/scripts/app/models/models.html b/src/main/resources/static/frontend/app/scripts/app/models/models.html
index 191eef637d61f69a29211549fdd9f9166546385b..22850301055a395921dc1819af83883046e2f44b 100644
--- a/src/main/resources/static/frontend/app/scripts/app/models/models.html
+++ b/src/main/resources/static/frontend/app/scripts/app/models/models.html
@@ -1,22 +1,22 @@
-    <ul class="search-list" >
-        <li ng-repeat="model in models">
-            <span >
-                <img ng-src="{{getSvgUrl(model)}}" alt="" class="search-img">
-            </span>
-            <h3 class="search-title"><a ui-sref="models-edit({ slug: model.slug })">{{model.title}}</a></h3>
-            <div class="author-box">
-              <a href="{{'#/users/' + model.createdBy.id }}" class="avatar">
-                <img ng-src="{{model.createdBy.picture}}" alt="" class="avatar" />
-              </a>
-              by <a href="{{'#/users/' + model.createdBy.id }}">{{model.createdBy.fullname}}</a><br />
-              <span class="time">{{model.createdAt | fromNow}}</span>
-            </div>
-        </li>
-        <li ng-if="!models || models.length == 0" class="mini-timeline-default">
-          <div class="timeline-body ml-n">
-            <div class="timeline-content">No model available</div>
-          </div>
-        </li>
-    </ul>
-
-    <button ng-if="models.length > 0" type="button" data-loading-text="Loading..." class="loading-example-btn btn btn-sm btn-default">See more</button>
+    <ul class="search-list" >
+        <li ng-repeat="model in models">
+            <span >
+                <img ng-src="{{getSvgUrl(model)}}" alt="" class="search-img">
+            </span>
+            <h3 class="search-title"><a ui-sref="models-edit({ slug: model.slug })">{{model.title}}</a></h3>
+            <div class="author-box">
+              <a href="{{'#/users/' + model.createdBy.username }}" class="avatar">
+                <img ng-src="{{model.createdBy.picture}}" alt="" class="avatar" />
+              </a>
+              by <a href="{{'#/users/' + model.createdBy.username }}">{{model.createdBy.fullname}}</a><br />
+              <span class="time">{{model.createdAt | fromNow}}</span>
+            </div>
+        </li>
+        <li ng-if="!models || models.length == 0" class="mini-timeline-default">
+          <div class="timeline-body ml-n">
+            <div class="timeline-content">No model available</div>
+          </div>
+        </li>
+    </ul>
+
+    <button ng-if="models.length > 0" type="button" data-loading-text="Loading..." class="loading-example-btn btn btn-sm btn-default">See more</button>
diff --git a/src/main/resources/static/frontend/app/scripts/app/mydata/mydata.html b/src/main/resources/static/frontend/app/scripts/app/mydata/mydata.html
index 9c05890fc52f99a8bee9af2be9e6446ad8c5dccc..294a39c704c273912e462f5829248f49878a09c7 100644
--- a/src/main/resources/static/frontend/app/scripts/app/mydata/mydata.html
+++ b/src/main/resources/static/frontend/app/scripts/app/mydata/mydata.html
@@ -1,57 +1,57 @@
-<div class="mt">
-    <div class="container-fluid">
-        <div data-widget-group="group1" class="gridster">
-                <div ng-repeat="item in rows" class="grid-item" data-row="{{item.row}}" data-col="{{item.col}}" data-sizex="{{item.size}}" data-sizey="1">
-                    <div class="panel panel-default ui-state-default panel-height-fixe"
-                         data-widget='{"draggable": "false"}'>
-                        <div class="panel-heading">
-                            <h2>{{item.data.title}}</h2>
-
-                            <div class="panel-ctrls button-icon-bg"
-                                 data-actions-container=""
-                                 data-action-collapse='{"target": ".panel-body"}'
-                                 data-action-refresh-demo='{"type": "circular"}'
-                                    >
-                            </div>
-                        </div>
-                      <div class="panel-body panel-body-graph" ng-if="item.type === 'M'">
-                        <highchart config="item.data.chartConfig"></highchart>
-                      </div>
-                        <a ng-href="#/models/{{item.data.slug}}/false" class="panel-link" ng-if="item.type === 'M'"><i>+</i></a>
-                        <div class="panel-body panel-body-article" ng-if="item.type === 'A'">
-                            <div class="content">
-                                <h3 class="content-title">{{item.data.title}}</h3>
-                                <p class="content-abstract" ng-bind-html="item.data.abstract"></p>
-                            </div>
-
-                            <div class="author-box">
-                              <a ng-href="#/users/{{item.data.createdBy.id}}" class="avatar">
-                                <img ng-src="{{item.data.createdBy.picture}}" alt="" class="avatar" />
-                              </a>
-                              by <a ng-href="#/users/{{item.data.createdBy.id}}">{{item.data.createdBy.fullname}}</a><br />
-                              <span class="time">{{item.data.createdAt | fromNow}}</span>
-                            </div>
-
-                            <div class="action">
-                                <a data-toggle="modal" href="" ng-click="showArticleModal(item.data)" class="icon-tl">
-                                        <span class="icon-bg">
-                                            <i class="icon-preview"></i>
-                                        </span>
-                                </a>
-                                <a ng-href="{{getPdfUrl(item.data.slug)}}" target="_blank" class="icon-tl">
-                                        <span class="icon-bg">
-                                            <i class="icon-pdf"></i>
-                                        </span>
-                                </a>
-                                <a ng-if="isMine(item.data)" href="#/articles/edit/{{item.data.slug}}" class="icon-tl">
-                                        <span class="icon-bg">
-                                            <i class="icon-html"></i>
-                                        </span>
-                                </a>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-        </div>
-    </div>
-</div>
+<div class="mt">
+    <div class="container-fluid">
+        <div data-widget-group="group1" class="gridster">
+                <div ng-repeat="item in rows" class="grid-item" data-row="{{item.row}}" data-col="{{item.col}}" data-sizex="{{item.size}}" data-sizey="1">
+                    <div class="panel panel-default ui-state-default panel-height-fixe"
+                         data-widget='{"draggable": "false"}'>
+                        <div class="panel-heading">
+                            <h2>{{item.data.title}}</h2>
+
+                            <div class="panel-ctrls button-icon-bg"
+                                 data-actions-container=""
+                                 data-action-collapse='{"target": ".panel-body"}'
+                                 data-action-refresh-demo='{"type": "circular"}'
+                                    >
+                            </div>
+                        </div>
+                      <div class="panel-body panel-body-graph" ng-if="item.type === 'M'">
+                        <highchart config="item.data.chartConfig"></highchart>
+                      </div>
+                        <a ng-href="#/models/{{item.data.slug}}/false" class="panel-link" ng-if="item.type === 'M'"><i>+</i></a>
+                        <div class="panel-body panel-body-article" ng-if="item.type === 'A'">
+                            <div class="content">
+                                <h3 class="content-title">{{item.data.title}}</h3>
+                                <p class="content-abstract" ng-bind-html="item.data.abstract"></p>
+                            </div>
+
+                            <div class="author-box">
+                              <a ng-href="#/users/{{item.data.createdBy.username}}" class="avatar">
+                                <img ng-src="{{item.data.createdBy.picture}}" alt="" class="avatar" />
+                              </a>
+                              by <a ng-href="#/users/{{item.data.createdBy.username}}">{{item.data.createdBy.fullname}}</a><br />
+                              <span class="time">{{item.data.createdAt | fromNow}}</span>
+                            </div>
+
+                            <div class="action">
+                                <a data-toggle="modal" href="" ng-click="showArticleModal(item.data)" class="icon-tl">
+                                        <span class="icon-bg">
+                                            <i class="icon-preview"></i>
+                                        </span>
+                                </a>
+                                <a ng-href="{{getPdfUrl(item.data.slug)}}" target="_blank" class="icon-tl">
+                                        <span class="icon-bg">
+                                            <i class="icon-pdf"></i>
+                                        </span>
+                                </a>
+                                <a ng-if="isMine(item.data)" href="#/articles/edit/{{item.data.slug}}" class="icon-tl">
+                                        <span class="icon-bg">
+                                            <i class="icon-html"></i>
+                                        </span>
+                                </a>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+        </div>
+    </div>
+</div>
diff --git a/src/main/resources/static/frontend/app/scripts/app/users/users.service.js b/src/main/resources/static/frontend/app/scripts/app/users/users.service.js
index 3b09f4ca1b393bd8f182a31160e04ba32420e628..620afe05d66b6dc229f684caede49d01914ee163 100644
--- a/src/main/resources/static/frontend/app/scripts/app/users/users.service.js
+++ b/src/main/resources/static/frontend/app/scripts/app/users/users.service.js
@@ -34,8 +34,8 @@ angular.module('chuvApp.users')
           );
       },
 
-      get: function (id) {
-        $http.get("/users/"+id).success(function(data) {
+      get: function (username) {
+        $http.get("/users/"+username).success(function(data) {
           return data;
         }).error(function() {
           return null;
@@ -50,13 +50,8 @@ angular.module('chuvApp.users')
         return user
       },
 
-      remove: function (id) {
-        for (var idx in datas) {
-          if (datas.hasOwnProperty(idx) && datas[idx].id == id) {
-            datas.splice(idx, 1);
-            return;
-          }
-        }
+      remove: function (username) {
+        return;
       }
 
     };
diff --git a/src/main/resources/static/frontend/app/scripts/components/carrousel/carrousel-template.html b/src/main/resources/static/frontend/app/scripts/components/carrousel/carrousel-template.html
index 741caabaecafdbab850bf9c68ad93662d1b77107..d5f4ba075240b4f4c30a5b60b733fcf3ddbb26ce 100644
--- a/src/main/resources/static/frontend/app/scripts/components/carrousel/carrousel-template.html
+++ b/src/main/resources/static/frontend/app/scripts/components/carrousel/carrousel-template.html
@@ -1,39 +1,39 @@
-<div class="panel panel-transparent box-researches">
-    <div class="panel-heading">
-        <h2>Reasearches</h2>
-    </div>
-    <div class="panel-body">
-        <form class="form">
-            <input type="text" />
-            <button type="submit">
-                <i class="ti ti-search"></i>
-            </button>
-            <div class="icheck-minimal">
-                <div class="checkbox red">
-                    <label>
-                        <input type="checkbox" ng-model="mine" ng-change="onChangeMine({checked:mine})"> Only mine
-                    </label>
-                </div>
-            </div>
-        </form>
-        <div class="search-list">
-            <ul>
-                <li ng-repeat="item in items">
-                    <h3 class="search-title"><a href="#">{{item.title}}</a></h3>
-                    <span class="search-img">
-                        <carrousel-chart model="item"></carrousel-chart>
-                    </span>
-                    <div class="author-box">
-                      <a href="{{'#/users/' + item.createdBy.id }}" class="avatar">
-                        <img ng-src="{{item.createdBy.picture}}" alt="" class="avatar" />
-                      </a>
-                      by <a href="{{'#/users/' + item.createdBy.id }}">{{item.createdBy.fullname}}</a><br />
-                      <span class="time">{{item.createdAt | fromNow}}</span>
-                    </div>
-                </li>
-            </ul>
-            <carroussel-button class="carrousel-button carrousel-down" icon-class="ti ti-angle-down" on-click="onClickBtnDown(event)"></carroussel-button>
-            <carroussel-button class="carrousel-button carrousel-up" icon-class="ti ti-angle-up" on-click="onClickBtnUp(event)"></carroussel-button>
-        </div>
-    </div>
-</div>
+<div class="panel panel-transparent box-researches">
+    <div class="panel-heading">
+        <h2>Reasearches</h2>
+    </div>
+    <div class="panel-body">
+        <form class="form">
+            <input type="text" />
+            <button type="submit">
+                <i class="ti ti-search"></i>
+            </button>
+            <div class="icheck-minimal">
+                <div class="checkbox red">
+                    <label>
+                        <input type="checkbox" ng-model="mine" ng-change="onChangeMine({checked:mine})"> Only mine
+                    </label>
+                </div>
+            </div>
+        </form>
+        <div class="search-list">
+            <ul>
+                <li ng-repeat="item in items">
+                    <h3 class="search-title"><a href="#">{{item.title}}</a></h3>
+                    <span class="search-img">
+                        <carrousel-chart model="item"></carrousel-chart>
+                    </span>
+                    <div class="author-box">
+                      <a href="{{'#/users/' + item.createdBy.username }}" class="avatar">
+                        <img ng-src="{{item.createdBy.picture}}" alt="" class="avatar" />
+                      </a>
+                      by <a href="{{'#/users/' + item.createdBy.username }}">{{item.createdBy.fullname}}</a><br />
+                      <span class="time">{{item.createdAt | fromNow}}</span>
+                    </div>
+                </li>
+            </ul>
+            <carroussel-button class="carrousel-button carrousel-down" icon-class="ti ti-angle-down" on-click="onClickBtnDown(event)"></carroussel-button>
+            <carroussel-button class="carrousel-button carrousel-up" icon-class="ti ti-angle-up" on-click="onClickBtnUp(event)"></carroussel-button>
+        </div>
+    </div>
+</div>