diff --git a/views/bills/new.erb b/views/bills/new.erb
index af8e8e5..c476a04 100644
--- a/views/bills/new.erb
+++ b/views/bills/new.erb
@@ -13,7 +13,7 @@
 
   <form id='new_bill' method="post" action="/bill/create" enctype="multipart/form-data">
     <label for="issued_by"><%= I18n.t(:issued_by) %></label>
-    <input name="issued_by" type="text" required autofocus />
+    <input name="issued_by" maxlength="200" type="text" required autofocus />
 
     <label for="due_date"><%= I18n.t(:due_date) %></label>
     <input id="datepicker" name="due_date" type="text" placeholder="<%= I18n.t(:date_format) %>" required />
@@ -24,12 +24,12 @@
         <span class="prefix">R$</span>
       </div>
       <div class="small-10 columns">
-        <input name="total_amount" type="number" min="0.1" step="any" required />
+        <input name="total_amount" maxlength="100" type="number" min="0.1" step="any" required />
       </div>
     </div>
 
     <label for="barcode"><%= I18n.t(:barcode) %></label>
-    <input name="barcode" type="text" required />
+    <input name="barcode" maxlength="300" type="text" required />
 
     <label for="image"><%= I18n.t(:image) %></label>
     <input name="image" type="file" />
diff --git a/views/bills/reserve.erb b/views/bills/reserve.erb
index 9749d3f..cf7bb4e 100644
--- a/views/bills/reserve.erb
+++ b/views/bills/reserve.erb
@@ -24,11 +24,11 @@
       <form method="post" action="<%= @action %>">
         <div class="form-group">
           <label for="phone_number"><%= I18n.t(:phone_number) %></label>
-          <input name="phone_number" type="text" autofocus class="form-control">
+          <input name="phone_number" maxlength="20"  type="text" autofocus class="form-control">
         </div>
         <div class="form-group">
           <label for="email"><%= I18n.t(:email) %></label>
-          <input name="email" type="text" required value="<%= session['email']%>" class="form-control">
+          <input name="email" maxlength="100" type="text" required value="<%= session['email']%>" class="form-control">
         </div>
 
 
diff --git a/views/bills/update.erb b/views/bills/update.erb
index 6c8cff5..970ee21 100644
--- a/views/bills/update.erb
+++ b/views/bills/update.erb
@@ -14,7 +14,7 @@
 
   <form id='update_bill' method="post" action="/bill/update/<%= @bill.id %>" enctype="multipart/form-data">
     <label for="issued_by"><%= I18n.t(:issued_by) %></label>
-    <input name="issued_by" type="text" required autofocus value="<%= @bill.issued_by %>" />
+    <input name="issued_by" maxlength="200" type="text" required autofocus value="<%= @bill.issued_by %>" />
 
     <label for="due_date"><%= I18n.t(:due_date) %></label>
     <input id="datepicker" name="due_date" type="text" placeholder="<%= I18n.t(:date_format) %>" value="<%= I18n.l @bill.due_date %>" required />
@@ -25,7 +25,7 @@
         <span class="prefix">R$</span>
       </div>
       <div class="small-10 columns">
-        <input name="total_amount" type="number" min="0.1" step="any" value="<%= @bill.total_amount %>" required />
+        <input name="total_amount" maxlength="200" type="number" min="0.1" step="any" value="<%= @bill.total_amount %>" required />
       </div>
     </div>
 
diff --git a/views/layout.erb b/views/layout.erb
index e6d385a..81c791c 100644
--- a/views/layout.erb
+++ b/views/layout.erb
@@ -34,10 +34,10 @@
               <a href="/auth" id="login_with_google" class="login-link">Login with Google</a>
             <% end %>
 
-            <a class="link-lang" href="/locale/pt">
+            <a id="link-pt" class="link-lang" href="/locale/pt">
               <img src="/img/brazil_flag.png" alt="Versão em Português">
             </a>
-            <a class="link-lang" href="/locale/en">
+            <a id="link-en" class="link-lang" href="/locale/en">
               <img src="/img/usa_flag.png" alt="English Version">
             </a>
           </div>
diff --git a/views/ngo/index.erb b/views/ngo/index.erb
index bccd31b..27cb72d 100644
--- a/views/ngo/index.erb
+++ b/views/ngo/index.erb
@@ -81,60 +81,6 @@
                 <%= I18n.t("upload_receipt") %>
               </a>
             </div>
-
-
-
-            <!-- <div>
-              <a href="#" class="th radius <%= bill.status %>" data-reveal-id="myModal<%= bill.id %>">
-                <img class="center" src="<%= bill.url %>" alt="<%= bill.filename %>" />
-                <p class="issued-by"><%= bill.issued_by %></p>
-                <p class="total_amount">R$ <%= bill.total_amount %></p>
-              </a>
-
-              <div class="text-center">
-                <% if bill.status == :opened %>
-                  <a href="/bill/reserve/<%= bill.id %>" class="tiny button">
-                    <%= I18n.t("reserve_bill") %>
-                  </a>
-                <% end %>
-                <a href="/bills/<%= bill.id %>/receipts/new" class="tiny button">
-                  <%= I18n.t("upload_receipt") %>
-                </a>
-              </div>
-            </div>
-   -->
-
-
-            <!-- <section class="reveal-modal small-12" id="myModal<%= bill.id %>">
-              <a class="close-reveal-modal">&#215;</a>
-              <div class="small-8">
-                <h4><%= bill.issued_by %></h4>
-                <p>R$ <%= bill.total_amount %></p>
-                <p class="due_date" data-timestamp="<%=bill.due_date.to_time.to_i%>"><%= I18n.l bill.due_date %></p>
-                <p><%= bill.barcode %></p>
-              </div>
-              <div>
-                <a href="<%= bill.url %>" >
-                  <img class="small-4" src="<%= bill.url %>" alt="<%= bill.filename %>"/>
-                </a>
-              </div>
-              <% if logged_as_admin?  %>
-                <div class="row text-center">
-                  <form id='remove_bill_form' method="post" action="/bill/remove/<%= bill.id %>" enctype="multipart/form-data">
-                    <a href="/bill/update/<%= bill.id %>" class="tiny button"><%= I18n.t("update_bill_button") %></a>
-                    <input name="_method" type="hidden" value="delete">
-                    <button type="submit" class="tiny button" onclick="return confirm('<%= I18n.t("confirm_remove")%>')">
-                      <%= I18n.t("remove_bill")%>
-                    </button>
-                    <% if bill.status == :waiting_confirmation %>
-                      <a href="/bill/close/<%= bill.id %>" class="tiny button"><%= I18n.t("close_bill") %></a>
-                    <% end %>
-                  </form>
-                </div>
-              <% end %>
-            </section> -->
-
-
           </li>
         <% end %>
       </ul>
diff --git a/views/receipts/new.erb b/views/receipts/new.erb
index 8fe0db3..d4ff2e8 100644
--- a/views/receipts/new.erb
+++ b/views/receipts/new.erb
@@ -25,12 +25,12 @@
       <form method="post" action="/bills/<%= @bill.id %>/receipts/create" enctype="multipart/form-data">
         <div class="form-group">
           <label for="contributor_name"><%= I18n.t(:name) %></label>
-          <input name="contributor_name" type="text" autofocus value="<%= session['name']%>"  class="form-control">
+          <input name="contributor_name" maxlength="200" type="text" autofocus value="<%= session['name']%>"  class="form-control">
         </div>
 
         <div class="form-group">
           <label for="contributor_email"><%= I18n.t(:email) %></label>
-          <input name="contributor_email" type="text" required value="<%= session['email']%>"  class="form-control">
+          <input name="contributor_email" maxlength="100" type="text" required value="<%= session['email']%>"  class="form-control">
         </div>
 
         <div class="form-group">