diff --git a/.DS_Store b/.DS_Store
index 9efbcec..f477844 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/README.md b/README.md
index b7ee47b..8af2a2f 100644
--- a/README.md
+++ b/README.md
@@ -39,4 +39,4 @@ You can open an issue and there you must describe the feedback, the bug or the n
 
 See folder <code>screenshots</code> to see screenshots also of the older versions.
 
-<img src=“screenshots/2.0/1.png" width="400px"></img><img src="screenshots/2.0/2.png" width="400px"></img><img src="screenshots/2.0/3.png" width="400px"></img>
+<img src="screenshots/2.1/1.png" width="400px"></img><img src="screenshots/2.1/2.png" width="400px"></img><img src="screenshots/2.1/3.png" width="400px"></img>
diff --git a/js/all-websites.js b/js/all-websites.js
index 90a4e6b..6b68397 100644
--- a/js/all-websites.js
+++ b/js/all-websites.js
@@ -366,7 +366,9 @@ function loadAllWebsites(clear = true, load_all_websites = true, apply_filter =
         let websites_to_use = getWebsitesToUse(websites_json);
 
         //console.log(websites_to_use)
-        websites_to_use = sortByColumn("website", websites_to_use, false, false);
+        if (apply_filter) {
+            //websites_to_use = sortByColumn("website", websites_to_use, false, false);
+        }
         showWebsitesTable(websites_to_use, apply_filter);
 
     } else {
@@ -418,7 +420,11 @@ function getTHeadTable(websites, last_seven_days) {
     tableHeaderElement.textContent = "Website";
     tableHeaderElement.id = "th-website";
     tableHeaderElement.classList.add("th-sort-by-column");
-    if (sorted_by === "" || sorted_by === "website-asc") tableHeaderElement.classList.add("th-sort-by-column-sel", "sort-by-column-asc");
+    if (sorted_by === "" || sorted_by === "website-asc") {
+        tableHeaderElement.classList.add("th-sort-by-column-sel", "sort-by-column-asc");
+        sorted_by = "website-asc";
+    }
+    if (sorted_by === "website-desc") tableHeaderElement.classList.add("th-sort-by-column-sel", "sort-by-column-desc");
     tableHeaderElement.onclick = function () {
         websites = sortByColumn("website", websites);
     }
@@ -428,6 +434,8 @@ function getTHeadTable(websites, last_seven_days) {
     tableHeaderElement.textContent = "Status";
     tableHeaderElement.id = "th-status";
     tableHeaderElement.classList.add("th-sort-by-column");
+    if (sorted_by === "status-asc") tableHeaderElement.classList.add("th-sort-by-column-sel", "sort-by-column-asc");
+    if (sorted_by === "status-desc") tableHeaderElement.classList.add("th-sort-by-column-sel", "sort-by-column-desc");
     tableHeaderElement.onclick = function () {
         websites = sortByColumn("status", websites);
     }
@@ -437,6 +445,8 @@ function getTHeadTable(websites, last_seven_days) {
     tableHeaderElement.textContent = "Category";
     tableHeaderElement.id = "th-category";
     tableHeaderElement.classList.add("th-sort-by-column");
+    if (sorted_by === "category-asc") tableHeaderElement.classList.add("th-sort-by-column-sel", "sort-by-column-asc");
+    if (sorted_by === "category-desc") tableHeaderElement.classList.add("th-sort-by-column-sel", "sort-by-column-desc");
     tableHeaderElement.onclick = function () {
         websites = sortByColumn("category", websites);
     }
@@ -446,6 +456,8 @@ function getTHeadTable(websites, last_seven_days) {
     tableHeaderElement.textContent = "Since install";
     tableHeaderElement.id = "th-since-install";
     tableHeaderElement.classList.add("th-sort-by-column");
+    if (sorted_by === "since-install-asc") tableHeaderElement.classList.add("th-sort-by-column-sel", "sort-by-column-asc");
+    if (sorted_by === "since-install-desc") tableHeaderElement.classList.add("th-sort-by-column-sel", "sort-by-column-desc");
     tableHeaderElement.onclick = function () {
         websites = sortByColumn("since-install", websites);
     }
@@ -457,6 +469,8 @@ function getTHeadTable(websites, last_seven_days) {
         tableHeaderElement.textContent = date_to_show;
         tableHeaderElement.id = "th-date-" + date;
         tableHeaderElement.classList.add("th-sort-by-column");
+        if (sorted_by === "th-date-" + date + "-asc") tableHeaderElement.classList.add("th-sort-by-column-sel", "sort-by-column-asc");
+        if (sorted_by === "th-date-" + date + "-desc") tableHeaderElement.classList.add("th-sort-by-column-sel", "sort-by-column-desc");
         tableHeaderElement.onclick = function () {
             websites = sortByColumn("date-" + date, websites);
         }
@@ -593,6 +607,8 @@ function showWebsitesTable(websites, apply_filter = true) {
     let tableTHeadElement = getTHeadTable(websites, getLastSevenDays());
     tableElement.append(tableTHeadElement);
 
+    websites = sortByColumn(sorted_by.replace("-asc", "").replace("-desc", ""), websites, false, false);
+
     let tableTBodyElement = getTBodyTable(websites, getLastSevenDays());
     tableElement.append(tableTBodyElement);
 
diff --git a/manifest.json b/manifest.json
index d107382..f71180d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,7 +1,7 @@
 {
   "manifest_version": 2,
   "name": "Limite",
-  "version": "2.1",
+  "version": "2.1.1",
   "author": "Saverio Morelli (Sav22999)",
   "description": "Check how much time you spend on each website every day.\nOptimise your productivity, your time and your life as well.\nDon't lose precious time!",
   "icons": {
diff --git a/screenshots/2.1/2.png b/screenshots/2.1/2.png
index 92156e3..59d9bb2 100644
Binary files a/screenshots/2.1/2.png and b/screenshots/2.1/2.png differ
diff --git a/screenshots/2.1/2.xcf b/screenshots/2.1/2.xcf
index a4ad71c..a3da4fe 100644
Binary files a/screenshots/2.1/2.xcf and b/screenshots/2.1/2.xcf differ