diff --git a/CHANGELOG.md b/CHANGELOG.md
index 35d175a6..806a01b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,8 @@ ml).
 ## master
 
 ## testing
+
+## [2.1.0] - 2022-05-11
 - [added] #219 Add functionality to searchbar (Lots and devices).
 - [added] #222 Allow user to update its password.
 - [added] #233 Filter in out trades from lots selector.
diff --git a/ereuse_devicehub/__init__.py b/ereuse_devicehub/__init__.py
index 4bf535c4..28c957cd 100644
--- a/ereuse_devicehub/__init__.py
+++ b/ereuse_devicehub/__init__.py
@@ -1 +1 @@
-__version__ = "2.1.0.dev"
+__version__ = "2.2.0.alpha0"
diff --git a/ereuse_devicehub/static/js/main_inventory.js b/ereuse_devicehub/static/js/main_inventory.js
index 848c72e4..1b911579 100644
--- a/ereuse_devicehub/static/js/main_inventory.js
+++ b/ereuse_devicehub/static/js/main_inventory.js
@@ -83,26 +83,33 @@ window.addEventListener("DOMContentLoaded", () => {
     const alertInfoDevices = document.getElementById("select-devices-info");
 
     function itemListCheckChanged() {
-        const listDevices = TableController.getAllDevicesInCurrentPage()
-        const isAllChecked = listDevices.map(itm => itm.checked);
+        alertInfoDevices.innerHTML = `Selected devices: ${TableController.getSelectedDevices().length}
+            ${TableController.getAllDevices().length != TableController.getSelectedDevices().length
+                    ? `<a href="#" class="ml-3">Select all devices (${TableController.getAllDevices().length})</a>`
+                    : "<a href=\"#\" class=\"ml-3\">Cancel selection</a>"
+            }`;
 
-        if (isAllChecked.every(bool => bool == true)) {
-            btnSelectAll.checked = true;
-            btnSelectAll.indeterminate = false;
-            alertInfoDevices.innerHTML = `Selected devices: ${TableController.getSelectedDevices().length}
-                                            ${
-                                                TableController.getAllDevices().length != TableController.getSelectedDevices().length
-                                                    ? `<a href="#" class="ml-3">Select all devices (${TableController.getAllDevices().length})</a>`
-                                                    : "<a href=\"#\" class=\"ml-3\">Cancel selection</a>"
-                                            }`;
-            alertInfoDevices.classList.remove("d-none");
-        } else if (isAllChecked.every(bool => bool == false)) {
-            btnSelectAll.checked = false;
-            btnSelectAll.indeterminate = false;
+        if (TableController.getSelectedDevices().length <= 0) {
             alertInfoDevices.classList.add("d-none")
         } else {
+            alertInfoDevices.classList.remove("d-none");
+        }
+
+        if (TableController.getAllDevices().length == TableController.getSelectedDevices().length) {
+            btnSelectAll.checked = true;
+            btnSelectAll.indeterminate = false;
+        } else if(TableController.getAllSelectedDevicesInCurrentPage().length > 0) {
             btnSelectAll.indeterminate = true;
-            alertInfoDevices.classList.add("d-none")
+        } else {
+            btnSelectAll.checked = false;
+            btnSelectAll.indeterminate = false;
+        }
+
+        if (TableController.getAllDevices().length == 0) {
+            btnSelectAll.checked = false;
+            btnSelectAll.disabled = true;
+        } else {
+            btnSelectAll.disabled = false;
         }
     }
 
@@ -126,6 +133,8 @@ window.addEventListener("DOMContentLoaded", () => {
     table.on("datatable.page", () => itemListCheckChanged());
     table.on("datatable.perpage", () => itemListCheckChanged());
     table.on("datatable.update", () => itemListCheckChanged());
+
+    itemListCheckChanged();
 })
 
 function deviceSelect() {
diff --git a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
index f010e3d7..f6423759 100644
--- a/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
+++ b/ereuse_devicehub/templates/ereuse_devicehub/user_login.html
@@ -60,7 +60,7 @@
                     <button class="btn btn-primary w-100" type="submit">Login</button>
                   </div>
                   <div class="col-12">
-                    <p class="small mb-0">Don't have account? <a href="#TODO">Create an account</a></p>
+                    <p class="small mb-0">Don't have account? <a href="#TODO" onclick="$('#exampleModal').modal('show')" data-toggle="modal" data-target="#exampleModal">Create an account</a></p>
                   </div>
                 </form>
 
@@ -83,4 +83,18 @@
 
   </div>
 </main><!-- End #main -->
+
+<!-- Modal -->
+<div class="modal fade" id="exampleModal" tabindex="-1" role="dialog" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog  modal-dialog-centered" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Do you want to try USOdy tools?</h5>
+      </div>
+      <div class="modal-body">
+        Just write an email to <a href="mali:hello@usody.com">hello@usody.com</a>
+      </div>
+    </div>
+  </div>
+</div> <!-- End register modal -->
 {% endblock body %}
diff --git a/ereuse_devicehub/templates/inventory/device_list.html b/ereuse_devicehub/templates/inventory/device_list.html
index ef8f7aef..b457b080 100644
--- a/ereuse_devicehub/templates/inventory/device_list.html
+++ b/ereuse_devicehub/templates/inventory/device_list.html
@@ -84,7 +84,7 @@
                 </button>
                 <span class="d-none" id="activeTradeModal" data-bs-toggle="modal" data-bs-target="#tradeLotModal"></span>
                 <ul class="dropdown-menu" aria-labelledby="btnLots" id="dropDownLotsSelector">
-                  <h6 class="dropdown-header">Select some devices to manage lots</h6>
+                  <h6 class="dropdown-header">Select lots where to store the selected devices</h6>
                   <ul class="mx-3" id="LotsSelector"></ul>
                   <li><hr /></li>
                   <li>
@@ -392,7 +392,7 @@
                     {% for doc in lot.trade.documents %}
                     <tr>
                       <td>
-                        {% if doc.url.to_text() %}
+                        {% if doc.url %}
                           <a href="{{ doc.url.to_text() }}" target="_blank">{{ doc.file_name}}</a>
                         {% else %}
                           {{ doc.file_name}}