diff --git a/android/app/build.gradle b/android/app/build.gradle
index 581d5cf..97ae8aa 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -5,8 +5,14 @@ plugins {
     id "dev.flutter.flutter-gradle-plugin"
 }
 
+def keystoreProperties = new Properties()
+def keystorePropertiesFile = rootProject.file('key.properties')
+if (keystorePropertiesFile.exists()) {
+    keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+}
+
 android {
-    namespace = "com.example.shopping_list"
+    namespace = "com.loiclabas.shopping_list"
     compileSdk = flutter.compileSdkVersion
     ndkVersion = flutter.ndkVersion
 
@@ -21,7 +27,7 @@ android {
 
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
-        applicationId = "com.example.shopping_list"
+        applicationId = "com.loiclabas.shopping_list"
         // You can update the following values to match your application needs.
         // For more information, see: https://flutter.dev/to/review-gradle-config.
         minSdk = flutter.minSdkVersion
@@ -30,11 +36,20 @@ android {
         versionName = flutter.versionName
     }
 
+    signingConfigs {
+        release {
+            keyAlias keystoreProperties['keyAlias']
+            keyPassword keystoreProperties['keyPassword']
+            storeFile keystoreProperties['storeFile'] ? file(keystoreProperties['storeFile']) : null
+            storePassword keystoreProperties['storePassword']
+        }
+    }
+
     buildTypes {
         release {
             // TODO: Add your own signing config for the release build.
             // Signing with the debug keys for now, so `flutter run --release` works.
-            signingConfig = signingConfigs.debug
+            signingConfig = signingConfigs.release
         }
     }
 }
diff --git a/android/app/src/main/kotlin/com/example/shopping_list/MainActivity.kt b/android/app/src/main/kotlin/com/loiclabas/shopping_list/MainActivity.kt
similarity index 69%
rename from android/app/src/main/kotlin/com/example/shopping_list/MainActivity.kt
rename to android/app/src/main/kotlin/com/loiclabas/shopping_list/MainActivity.kt
index 3f6709a..038f89f 100644
--- a/android/app/src/main/kotlin/com/example/shopping_list/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/loiclabas/shopping_list/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.example.shopping_list
+package com.loiclabas.shopping_list
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/lib/providers/items_provider.dart b/lib/providers/items_provider.dart
index 0cb18ea..33a00cd 100644
--- a/lib/providers/items_provider.dart
+++ b/lib/providers/items_provider.dart
@@ -51,6 +51,7 @@ class ItemsProvider with ChangeNotifier {
   ///Get items by list id
   Future<void> getItemsByListId({required int listId}) async {
     List<Item> newItems = await ListRepository().getItemsByListId(listId: listId);
+    _sortItemsByStatus(newItems);
     //For add new item or items list is empty, refresh the list
     if(newItems.length > _items.length || newItems.isEmpty){
       _filteredItems = newItems;
diff --git a/lib/screens/list_screen.dart b/lib/screens/list_screen.dart
index 9c5a406..ace0094 100644
--- a/lib/screens/list_screen.dart
+++ b/lib/screens/list_screen.dart
@@ -75,6 +75,8 @@ class ListScreen extends StatelessWidget {
                               actions: <Widget> [
                                 ElevatedButton(
                                     onPressed: () {
+                                      FocusScope.of(context).requestFocus(FocusNode());
+                                      itemsProvider.resetSearch();
                                       itemsProvider.emptyList(listId: listId);
                                       Navigator.of(context).pop();
                                     },