diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 92f895a7..56cefb6c 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -17,12 +17,16 @@
 
         <activity
             android:name=".WalletActivity"
+            android:configChanges="orientation|keyboardHidden"
             android:label="@string/wallet_activity_name"
-            android:launchMode="singleTop"></activity>
+            android:launchMode="singleTop"
+            android:screenOrientation="portrait"></activity>
 
         <activity
             android:name=".LoginActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            android:configChanges="orientation|keyboardHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java b/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java
index 7fd17d27..e9a2c22a 100644
--- a/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java
+++ b/app/src/main/java/com/m2049r/xmrwallet/service/WalletService.java
@@ -34,12 +34,6 @@ import com.m2049r.xmrwallet.model.WalletListener;
 import com.m2049r.xmrwallet.model.WalletManager;
 import com.m2049r.xmrwallet.util.Helper;
 
-// Bind / Unbind
-// Activity onCreate() / onDestroy()
-// or
-// Activity onStart() / onStop()
-
-
 public class WalletService extends Service {
     final static String TAG = "WalletService";
 
@@ -133,16 +127,10 @@ public class WalletService extends Service {
             Log.d(TAG, "refreshed() " + wallet.getName() + " " + wallet.getBalance() + " sync=" + wallet.isSynchronized() + " with observer " + observer);
             if (updated) {
                 if (observer != null) {
-                    Log.d(TAG, "refreshed() A");
                     updateDaemonState(wallet, 0);
-                    Log.d(TAG, "refreshed() B");
                     TransactionHistory history = wallet.getHistory();
-                    Log.d(TAG, "refreshed() C " + history.getCount());
                     history.refresh();
-                    Log.d(TAG, "refreshed() D " + history.getCount());
-                    Log.d(TAG, "refreshed() E");
                     observer.onRefreshed(wallet, true);
-                    Log.d(TAG, "refreshed() D");
                     updated = false;
                 }
             }
@@ -418,4 +406,3 @@ public class WalletService extends Service {
         return wallet;
     }
 }
-