diff --git a/WEB-INF/src/controleurs/Feed.java b/WEB-INF/src/controleurs/Feed.java
index 90945fa41c39fd51da43d073237849c4c650e9a6..7d43f2cba05f29b6c340661bc123e3bba9739baf 100644
--- a/WEB-INF/src/controleurs/Feed.java
+++ b/WEB-INF/src/controleurs/Feed.java
@@ -41,31 +41,36 @@ public class Feed extends HttpServlet {
                 out.println("<title>Welcome</title>");
                 out.println("<h1>Welcome " + login + "</h1>");
 
-                out.println("<nav class=\"option_menu\">");
+                out.println("<nav class=\"menu\">");
                 out.println("<ul class=\"options_list\">");
-                out.println("<li class=\"option\">");
-
-                out.println("<h2>Recent messages</h2>");
-                out.println("<h2>Discover</h2>");
-
-                for (Message message : messages) {
-                    MyThread msgThread = null;
-                    try {
-                        msgThread = threadDao.getThreadById(message.getThreadId());
-                    } catch (SQLException e) {
-                        throw new RuntimeException(e);
+                out.println("<li class=\"option\"><a href=\"#\">\uD83C\uDFE0 Home</a></li>");
+                out.println("<li class=\"option\"><a href=\"#\">\uD83E\uDDF5 Followed</a></li>");
+                out.println("<li class=\"option\"><a href=\"#\">\uD83D\uDC64 Account</a></li>");
+                out.println("</ul></nav>");
+
+                if (!messages.isEmpty()) {
+                    for (Message message : messages) {
+                        MyThread msgThread = null;
+                        try {
+                            msgThread = threadDao.getThreadById(message.getThreadId());
+                        } catch (SQLException e) {
+                            throw new RuntimeException(e);
+                        }
+                        out.println("<div class=\"message\">");
+                        out.println("<h3 class=\"msgThread\">" + msgThread.getThreadName() + "</h3>");
+                        out.println("<p class=\"msgContent\">" + message.getContent() + "</p>");
+                        out.println("<form><button class=\"react\" type=\"submit\" value=\"Like\">");
+                        out.println("</div>");
                     }
-                    out.println("<div class=\"message\">");
-                    out.println("<h3 class=\"msgThread\">" + msgThread.getThreadName() + "</h3>");
-                    out.println("<p class=\"msgContent\">" + message.getContent() + "</p>");
-                    out.println("</div>");
                 }
-
-                
+                else {
+                    out.println("<p class=\"information\">You are not following any thread yet.</p>");
+                    out.println("<button><a href=\"\">Discover new threads</a></button>");
+                }
 
                 out.println("</body>");
                 out.println("<footer>");
-                out.println("Connecté en tant que " + login);
+                out.println("Connected as " + login);
                 out.println("</footer>");
                 out.println("</html>");