diff --git a/.gitignore b/.gitignore
index d5aa5f0..b9e9a75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,3 +43,5 @@ app.*.map.json
 /android/app/profile
 /android/app/release
 /android/key.properties
+
+# NEVER STORE ANY KEY OR API KEYS WHEN COMMITING CODE!!
diff --git a/android/app/build.gradle b/android/app/build.gradle
index cf8a587..73e9618 100644
--- a/android/app/build.gradle
+++ b/android/app/build.gradle
@@ -49,7 +49,7 @@ android {
     }
 
     defaultConfig {
-        applicationId "de.voidspace.recon"
+        applicationId "de.tojcklguy.opencontacts"
         minSdkVersion 24
         targetSdkVersion flutter.targetSdkVersion
         versionCode flutterVersionCode.toInteger()
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
index 68748a4..15eb43f 100644
--- a/android/app/src/debug/AndroidManifest.xml
+++ b/android/app/src/debug/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.voidspace.recon">
+    package="de.tojcklguy.opencontacts">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index bd0fde5..04d813e 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.voidspace.recon">
+    package="de.tojcklguy.opencontacts">
 
     <!-- Required to fetch data from the internet. -->
     <uses-permission android:name="android.permission.INTERNET" />
diff --git a/android/app/src/main/kotlin/de/voidspace/recon/MainActivity.kt b/android/app/src/main/kotlin/de/voidspace/recon/MainActivity.kt
index 61d9bb0..d86b75a 100644
--- a/android/app/src/main/kotlin/de/voidspace/recon/MainActivity.kt
+++ b/android/app/src/main/kotlin/de/voidspace/recon/MainActivity.kt
@@ -1,4 +1,4 @@
-package de.voidspace.recon
+package de.tojcklguy.opencontacts
 
 import io.flutter.embedding.android.FlutterActivity
 
diff --git a/android/app/src/profile/AndroidManifest.xml b/android/app/src/profile/AndroidManifest.xml
index 68748a4..15eb43f 100644
--- a/android/app/src/profile/AndroidManifest.xml
+++ b/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.voidspace.recon">
+    package="de.tojcklguy.opencontacts">
     <!-- The INTERNET permission is required for development. Specifically,
          the Flutter tool needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
diff --git a/lib/widgets/friends/friends_list_app_bar.dart b/lib/widgets/friends/friends_list_app_bar.dart
index f2ac86a..bbe5f0a 100644
--- a/lib/widgets/friends/friends_list_app_bar.dart
+++ b/lib/widgets/friends/friends_list_app_bar.dart
@@ -53,7 +53,7 @@ class _FriendsListAppBarState extends State<FriendsListAppBar> with AutomaticKee
               }
             },
             itemBuilder: (BuildContext context) => OnlineStatus.values
-                .where((element) => element == OnlineStatus.online || element == OnlineStatus.offline).sorted((a, b) => b.index.compareTo(a.index),)
+                .where((element) => element == OnlineStatus.sociable || element == OnlineStatus.online ||element == OnlineStatus.busy || element == OnlineStatus.offline).sorted((a, b) => b.index.compareTo(a.index),)
                 .map(
                   (item) => PopupMenuItem<OnlineStatus>(
                     value: item,
diff --git a/lib/widgets/homepage.dart b/lib/widgets/homepage.dart
index fe8118b..81420cd 100644
--- a/lib/widgets/homepage.dart
+++ b/lib/widgets/homepage.dart
@@ -17,8 +17,8 @@ class Home extends StatefulWidget {
 
 class _HomeState extends State<Home> {
   static const List<Widget> _appBars = [
-    FriendsListAppBar(),
     SessionListAppBar(),
+    FriendsListAppBar(),
     InventoryBrowserAppBar(),
     SettingsAppBar()
   ];
@@ -41,8 +41,8 @@ class _HomeState extends State<Home> {
         controller: _pageController,
         physics: const NeverScrollableScrollPhysics(),
         children: const [
-          FriendsList(),
           SessionList(),
+          FriendsList(),
           InventoryBrowser(),
           SettingsPage(),
         ],
@@ -60,14 +60,14 @@ class _HomeState extends State<Home> {
           });
         },
         destinations: const [
-          NavigationDestination(
-            icon: Icon(Icons.message),
-            label: "Chat",
-          ),
           NavigationDestination(
             icon: Icon(Icons.public),
             label: "Sessions",
           ),
+          NavigationDestination(
+            icon: Icon(Icons.message),
+            label: "Chat",
+          ),
           NavigationDestination(
             icon: Icon(Icons.inventory),
             label: "Inventory",
diff --git a/lib/widgets/login_screen.dart b/lib/widgets/login_screen.dart
index a0bd481..68ef382 100644
--- a/lib/widgets/login_screen.dart
+++ b/lib/widgets/login_screen.dart
@@ -111,8 +111,8 @@ class _LoginScreenState extends State<LoginScreen> {
       });
     }
   }
-    Future<void> passwordResetSubmit() async {
- if (_usernameController.text.isEmpty) { 
+  Future<void> passwordResetSubmit() async {
+    if (_usernameController.text.isEmpty) { 
       setState(() {
         _error = "Please provide an email on the 'Username' textbox";
       });
@@ -297,7 +297,7 @@ class _LoginScreenState extends State<LoginScreen> {
                       label: const Text("Login"),
                     ),
             ),
-             Padding(
+             /*Padding(
               padding: const EdgeInsets.only(top: 16),
               child: _isEmailResetSend
                   ? const Center(child: CircularProgressIndicator())
@@ -306,7 +306,7 @@ class _LoginScreenState extends State<LoginScreen> {
                       icon: const Icon(Icons.refresh),
                       label: const Text("Forgot Password?"),
                     ),
-            ),
+            ),*/
             Center(
               child: AnimatedOpacity(
                 opacity: _errorOpacity,
diff --git a/linux/CMakeLists.txt b/linux/CMakeLists.txt
index a78073f..d199e8b 100644
--- a/linux/CMakeLists.txt
+++ b/linux/CMakeLists.txt
@@ -7,7 +7,7 @@ project(runner LANGUAGES CXX)
 set(BINARY_NAME "recon")
 # The unique GTK application identifier for this application. See:
 # https://wiki.gnome.org/HowDoI/ChooseApplicationID
-set(APPLICATION_ID "de.voidspace.recon")
+set(APPLICATION_ID "de.tojcklguy.opencontacts")
 
 # Explicitly opt in to modern CMake behaviors to avoid warnings with recent
 # versions of CMake.