diff --git a/templates/main.html b/templates/main.html
index 0b00f613..961f5dda 100644
--- a/templates/main.html
+++ b/templates/main.html
@@ -18,13 +18,48 @@
                     {% include "/components/event.html" %}
                 {% endfor %}
             </div>
+            <div class="box upper-box">
+                Pagine Wiki
+            </div>
+            <div class="box lower-box">
+                <ul>
+                    {% for page in wiki_pages %}
+                        <li><a href="/wiki/{{ page.key }}">{{ page.key }}</a></li>
+                    {% endfor %}
+                </ul>
+            </div>
         </div>
         <div class="right">
             <div class="box upper-box">
-                Sassi
+                Membri
             </div>
             <div class="box lower-box">
-                CIAOOOOOO
+                <ul>
+                    {% for royal in royals %}
+                        <li><a href="/profile/{{ royal.username }}">{{ royal.username }}</a></li>
+                    {% endfor %}
+                </ul>
+            </div>
+            <div class="box upper-box">
+                Resoconti
+            </div>
+            <div class="box lower-box">
+                <ul>
+                    <li><a href="/game/ryg">Royal Games</a></li>
+                    <li><a href="/game/steam">Steam</a></li>
+                    <li><a href="/game/dota">Dota 2</a></li>
+                    <li><a href="/game/rl">Rocket League</a></li>
+                    <li><a href="/game/lol">League of Legends</a></li>
+                    <li><a href="/game/ow">Overwatch</a></li>
+                    <li><a href="/game/osu">osu!</a></li>
+                </ul>
+            </div>
+            <div class="box upper-box">
+                Diario
+            </div>
+            <div class="box lower-box">
+                {% include "components/diarioentry.html" %}
+                <a href="/diario">Visualizza tutto</a>
             </div>
         </div>
     </div>
diff --git a/webserver.py b/webserver.py
index 187482ae..4d9154e5 100644
--- a/webserver.py
+++ b/webserver.py
@@ -60,7 +60,7 @@ def page_main():
     random_diario = db_session.query(db.Diario).order_by(db.func.random()).first()
     next_events = db_session.query(db.Event).filter(db.Event.time > datetime.datetime.now()).order_by(db.Event.time).all()
     db_session.close()
-    return render_template("main.html", royals=royals, wiki_pages=wiki_pages, diario=random_diario,
+    return render_template("main.html", royals=royals, wiki_pages=wiki_pages, entry=random_diario,
                            next_events=next_events, config=config, escape=escape)