diff --git a/src/index.hbs b/src/index.hbs
index 03deb51..40d54f1 100644
--- a/src/index.hbs
+++ b/src/index.hbs
@@ -48,9 +48,9 @@
           </form>
         </div>
         <br />
-        <ul class="nav nav-list">
+        <!-- <ul class="nav nav-list">
           <li><a href="https://twitter.com/squatconf">@squatconf</a>
-        </ul>
+        </ul> -->
         <br>
         <ul class="nav nav-list">
           <li><a href="#">#squatconf on freenode</a></li>
@@ -69,9 +69,13 @@
           "888888  888888  888.d888888888   888     888  888888  888888
     Y88b  d88PY88b 888Y88b 888888  888Y88b. Y88b.   Y88..88P888  888888
      "Y8888P"  "Y88888 "Y88888"Y888888 "Y888 "Y8888P "Y88P" 888  888888
-                   888
-                   888
-                   888
+                   888    ___.                .__  .__
+                   888    \_ |__   ___________|  | |__| ____
+                   888     | __ \_/ __ \_  __ \  | |  |/    \
+                           | \_\ \  ___/|  | \/  |_|  |   |  \
+                           |___  /\___  >__|  |____/__|___|  /
+                               \/     \/                   \/
+
         </small></pre>
           <pre class="dskW">
          ____                    _    ____             __
@@ -80,15 +84,21 @@
          ___) | (_| | |_| | (_| | |_| |__| (_) | | | |  _|
         |____/ \__, |\__,_|\__,_|\__|\____\___/|_| |_|_|
                   |_|
+
+                  ___.                .__  .__
+                  \_ |__   ___________|  | |__| ____
+                   | __ \_/ __ \_  __ \  | |  |/    \
+                   | \_\ \  ___/|  | \/  |_|  |   |  \
+                   |___  /\___  >__|  |____/__|___|  /
+                       \/     \/                   \/
 <br></pre>
           <pre class="tblW">
-     __
-    (_  _     _ |_
-    __)(_||_|(_||_
-         |
-     __       _
-    /   _  _ (_
-    \__(_)| )|
+         __.          ,          ._
+        (__  _.. . _.-+- _. _ ._ |,
+        .__)(_](_|(_] | (_.(_)[ )|
+        .__   |   .
+        [__) _ ._.|*._
+        [__)(/,[  ||[ )
 <br></pre>
         </div>
         <div class="page-header">
diff --git a/src/index.md b/src/index.md
index 4b9a69c..4fe65b2 100644
--- a/src/index.md
+++ b/src/index.md
@@ -21,31 +21,37 @@ Fancy venues, transportation, hotels and food are really nice perks to have, but
 If you hold a conference in a squat… the speakers advance their travel expenses…
 you can have a almost zero cost conference made with love, a little rougher around the edges and it allow you to remove sponsors from the equation.
 
-Where and when?
-Now
+## Where, when, how much does this cost?
+
+### Now
 Berlin, 29-30 April 2016
 
-past
+### Past
 14/11/15 : Le hangard56
 
-Tickets will be donation-based, venue will be disclosed later, for more info subscribe to the mailing list
+There won't be any tickets, the event is donation-based, venue will be disclosed later, vegan and non vegan food will be available.
+
+### For more info subscribe to the [mailing list][4]
 
 I want to speak / do a workshop / dance
 
-everybody here is welcome, we won't promise that every proposal will be accepted, but they will all be displayed here and in a git repository, and the curation process will happened in the open.
+Everybody here is welcome, we won't promise that every proposal will be accepted, but they will all be displayed here and in a git repository, and the curation process will happened in the open.
+
+See the side column for info to propose a talk/workshop/whatever
 
 ## Who is behind this
 
-a bunch of people that had fun at the first one, or knew each others before, coming from loads of different horizons.
+A bunch of people that had fun at the first one, or knew each others before, coming from loads of different horizons.
 
 ## Etiquette
-while we are open to discuss a lot of things, we are
-- antifascists
-- against all form of discrimination
+While we are open to discuss a lot of things, we are
+- ### antifascists
+- ### against all form of discrimination
 
-Hence any form of exclusion, harassment or the likes will NOT be tolerated, and we invite any witness of such thing to act accordingly if none of us are around.
-this is explained in detail in the [COC][3]
+Hence any form of exclusion, harassment, racism or the likes will NOT be tolerated.  
+This is explained in detail in the [COC][3]
 
 [1]: https://twitter.com/olizilla
 [2]: http://blog.tableflip.io/squatconf-information-wants-to-be-free/
 [3]: https://github.com/squatconf/organisation/blob/master/code_of_conduct.md#squatconf-code-of-conduct
+[4]: https://mailinglists.dyne.org/cgi-bin/mailman/listinfo/squatconf