diff --git a/TODO b/TODO
index 5a32992..7d74cd4 100755
--- a/TODO
+++ b/TODO
@@ -1,5 +1,6 @@
 * Don't cache the username
-* JSON output => do the template
+* JSON output => finish the template
+* API
 
 inc/Invoices.class.php :
 ========================
diff --git a/tpl/json/edit_users.html b/tpl/json/edit_users.html
index cb9669c..9896e63 100644
--- a/tpl/json/edit_users.html
+++ b/tpl/json/edit_users.html
@@ -3,6 +3,7 @@
 {/if}
 
 {if condition="$view == 'list_users'"}
+TODO ***
 <h2>List of users</h2>
 <p class="center">You can also <a href="?do=add_user">add a user</a>.</p>
 <table id="edit_users">
@@ -25,38 +26,6 @@
     </tr>
     {/loop}
 </table>
-{elseif condition="$view == 'edit_user'"}
-<h2>{$user_id != -1 ? 'Edit' : 'Add'} a user</h2>
-<form method="post" action="index.php?do={$user_id != -1 ? 'edit_users' : 'add_user'}" id="edit_user_form">
-    <p>
-        <label for="login" class="label-block">Login : </label><input type="text" name="login" id="login" {if condition="$login_post != ''"} value="{$login_post}" {else} {$user_id != -1 ? 'value="'.$user_data->getLogin().'"' : ''} {/if}/>
-    </p>
-    <p>
-        <label for="display_name" class="label-block">Displayed name : </label><input type="text" name="display_name" id="display_name" {if condition="$display_name_post != ''"} value="{$display_name_post}" {else} {$user_id != -1 ? 'value="'.$user_data->getDisplayName().'"' : ''} {/if}/>
-    </p>
-    <p>
-        <label for="password" class="label-block">Password : </label><input type="password" name="password" id="password"/>  <a href="" onclick="toggle_password('password'); return false;"><img src="img/toggleVisible.png" alt="Toggle visible"/></a>
-        {if condition="$user_id != -1"}
-            <br/><em>Note :</em> Leave blank this field if you don't want to edit password.
-        {/if}
-    </p>
-    <p id="edit_user_admin_rights">
-        Give admin rights to this user ?<br/>
-    <input type="radio" id="admin_yes" value="1" name="admin" {if condition="$admin_post == 1 || ($admin_post == -1 && $user_id != -1 && $user_data->getAdmin())"} checked{/if}/><label for="admin_yes">Yes</label><br/>
-    <input type="radio" id="admin_no" value="0" name="admin" {if condition="$admin_post == 0 || ($admin_post == -1 && ($user_id == -1 || !$user_data->getAdmin()))"} checked{/if}/><label for="admin_no">No</label>
-    </p>
-    <p class="center">
-        <input type="submit" value="{$user_id != -1 ? 'Edit' : 'Add'}"/>
-        {if condition="$user_id != -1"}<input type="hidden" name="user_id" value="{$user_id}"/>{/if}
-        <input type="hidden" name="token" value="{$token}"/>
-    </p>
-</form>
-
-{elseif condition="$view == 'password'"}
-<h2>Edit your password</h2>
-<form method="post" action="index.php?do=password" id="edit_password_form">
-    <p><label for="password" class="label-block">New password : </label><input type="password" id="password" name="password"/></p>
-    <p><label for="password_confirm" class="label-block">Confirm new password : </label><input type="password" id="password_confirm" name="password_confirm"/> <a href="" onclick="toggle_password('password_confirm'); return false;"><img src="img/toggleVisible.png" alt="Toggle visible"/></a></p>
-    <p class="center"><input type="submit" value="Update"/><input type="hidden" name="token" value="{$token}"</p>
-</form>
-{/if}
+{else}
+    {if condition="LANG == 'en'}Nothing to show.{else}Il n'y a rien à afficher.{/if}
+{/else}
diff --git a/tpl/json/index.html b/tpl/json/index.html
index cca8039..8f435f9 100755
--- a/tpl/json/index.html
+++ b/tpl/json/index.html
@@ -1,3 +1,4 @@
+TODO ***
 {if condition="$notice != ''"}
     <div id="notice"><p>{$notice}</p></div>
 {/if}
diff --git a/tpl/json/new_invoice.html b/tpl/json/new_invoice.html
index febe8f0..c9f38a6 100755
--- a/tpl/json/new_invoice.html
+++ b/tpl/json/new_invoice.html
@@ -1,52 +1 @@
-{if condition="$error != ''"}
-    <p class="error">{$error}</p>
-{/if}
-
-<h2>Add a bill</h2>
-
-<form method="post" action="index.php?do=new_invoice" id="invoice_form">
-    <fieldset>
-        <legend>Expense</legend>
-        <p>
-            <label for="what">What ? </label>
-        </p>
-        <textarea name="what" id="what" rows="10">{$what_post}</textarea>
-        <p>
-            <label for="amount">Amount : </label>
-            <input type="text" name="amount" id="amount" {if condition="$amount_post != 0"} value="{$amount_post}" {/if} size="5"/> {$currency}
-        </p>
-        <p>
-            <label for="date_day">Date : </label>
-            <select name="date_day" id="date_day">
-                {loop="days"}
-                <option value="{$value}" {if condition="$value == $day_post"}selected{/if}>{$value}</option>
-                {/loop}
-            </select> / 
-            <select name="date_month" id="date_month" onchange="set_days_month_year();">
-                {loop="months"}
-                <option value="{$value}" {if condition="$value == $month_post"}selected{/if}>{$value}</option>
-                {/loop}
-            </select> / 
-            <select name="date_year" id="date_year" onchange="set_days_month_year();">
-                {loop="years"}
-                    <option value="{$value}" {if condition="$value == $year_post"}selected{/if}>{$value}</option>
-                {/loop}
-            </select>
-            <select name="date_hour" id="date_hour">
-                <option value="0" {if condition="$hour_post == 0"}selected{/if}>AM</option>
-                <option value="1" {if condition="$hour_post == 1"}selected{/if}>PM</option>
-            </select>
-        </p>
-    </fieldset>
-    <fieldset>
-        <legend>Users in ?</legend>
-        {loop="users"}
-        <br/><input type="checkbox" name="users_in[]" value="{$value->getId()}" id="users_in_{$value->getId()}" {if condition="$current_user->getId() == $value->getId() || in_array($value->getId(), $users_in)"} checked {/if}/> <label for="users_in_{$value->getId()}">{$value->getDisplayName()}</label> and <input type="text" name="guest_user_{$value->getId()}" id="guest_user_{$value->getId()}" size="1" {if condition="in_array($value->getId(), $users_in)"} value="{$guests[$value->getId()]}" {else} value="0" {/if} onkeyup="guest_user_label({$value->getId()});"/><label for="guest_user_{$value->getId()}" id="guest_user_{$value->getId()}_label"> guest</label>.
-        {/loop}
-    </fieldset>
-    <p class="center">
-        <input type="submit" value="Add"/>
-        {if condition="$id != 0"}<input type="hidden" name="id" value="{$id}"/>{/if}
-        <input type="hidden" name="token" value="{$token}"/>
-    </p>
-</form>
+{if condition="LANG == 'en'}Nothing to show.{else}Il n'y a rien à afficher.{/if}
diff --git a/tpl/json/settings.html b/tpl/json/settings.html
index 66af828..190cf0f 100644
--- a/tpl/json/settings.html
+++ b/tpl/json/settings.html
@@ -1,4 +1,5 @@
 {if condition="!$show_settings"}
+TODO ***
 <h2>Edit homepage notice</h2>
 {if condition="$error"}<p class="error">{$error}</p>{/if}
 <form method="post" id="notice_form" action="index.php?do=edit_notice">
@@ -14,6 +15,7 @@
 </form>
 
 {else}
+TODO ***
 <h2>Change settings of your Bouffe@Ulm installation</h2>
 {if condition="$error"}<p class="error">{$error}</p>{/if}
 <form method="post" action="index.php?do=settings" id="settings_form">