diff --git a/src/acr/browser/lightning/BrowserActivity.java b/src/acr/browser/lightning/BrowserActivity.java
index 6c6cfd0..90d7645 100644
--- a/src/acr/browser/lightning/BrowserActivity.java
+++ b/src/acr/browser/lightning/BrowserActivity.java
@@ -376,7 +376,8 @@ public class BrowserActivity extends Activity implements BrowserController {
 							mDrawerRight);
 				} else if (drawerView.equals(mDrawerRight)) {
 					mDrawerLayout.closeDrawer(mDrawerLeft);
-					mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED, mDrawerLeft);
+					mDrawerLayout.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED,
+							mDrawerLeft);
 				}
 			}
 
@@ -765,42 +766,42 @@ public class BrowserActivity extends Activity implements BrowserController {
 				});
 		finder.show();
 	}
-	
+
 	private void showSearchInterfaceBar(String text) {
-        if (mCurrentView != null) {
-            mCurrentView.find(text);
-        }
+		if (mCurrentView != null) {
+			mCurrentView.find(text);
+		}
 
-        final RelativeLayout bar = (RelativeLayout) findViewById(R.id.search_bar);
-        bar.setVisibility(View.VISIBLE);
+		final RelativeLayout bar = (RelativeLayout) findViewById(R.id.search_bar);
+		bar.setVisibility(View.VISIBLE);
 
-        TextView tw = (TextView) findViewById(R.id.search_query);
-        tw.setText("'" + text + "'");
+		TextView tw = (TextView) findViewById(R.id.search_query);
+		tw.setText("'" + text + "'");
 
-        ImageButton up = (ImageButton) findViewById(R.id.button_next);
-        up.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mCurrentView.getWebView().findNext(true);
-            }
-        });
-        ImageButton down = (ImageButton) findViewById(R.id.button_back);
-        down.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mCurrentView.getWebView().findNext(false);
-            }
-        });
+		ImageButton up = (ImageButton) findViewById(R.id.button_next);
+		up.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				mCurrentView.getWebView().findNext(false);
+			}
+		});
+		ImageButton down = (ImageButton) findViewById(R.id.button_back);
+		down.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				mCurrentView.getWebView().findNext(true);
+			}
+		});
 
-        ImageButton quit = (ImageButton) findViewById(R.id.button_quit);
-        quit.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                mCurrentView.getWebView().clearMatches();
-                bar.setVisibility(View.GONE);
-            }
-        });
-    }
+		ImageButton quit = (ImageButton) findViewById(R.id.button_quit);
+		quit.setOnClickListener(new View.OnClickListener() {
+			@Override
+			public void onClick(View v) {
+				mCurrentView.getWebView().clearMatches();
+				bar.setVisibility(View.GONE);
+			}
+		});
+	}
 
 	/**
 	 * The click listener for ListView in the navigation drawer
diff --git a/src/acr/browser/lightning/PrivacySettingsActivity.java b/src/acr/browser/lightning/PrivacySettingsActivity.java
index b5b268e..c256d48 100644
--- a/src/acr/browser/lightning/PrivacySettingsActivity.java
+++ b/src/acr/browser/lightning/PrivacySettingsActivity.java
@@ -405,7 +405,6 @@ public class PrivacySettingsActivity extends Activity {
 			} catch (Exception ignored) {
 			}
 		}
-		SettingsController.setClearHistory(true);
 		Utils.trimCache(this);
 		messageHandler.sendEmptyMessage(1);
 	}
diff --git a/src/acr/browser/lightning/SettingsActivity.java b/src/acr/browser/lightning/SettingsActivity.java
index 5a6011f..d632e53 100644
--- a/src/acr/browser/lightning/SettingsActivity.java
+++ b/src/acr/browser/lightning/SettingsActivity.java
@@ -23,6 +23,7 @@ import android.view.WindowManager;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
+import android.widget.EditText;
 import android.widget.RelativeLayout;
 import android.widget.Switch;
 import info.guardianproject.onionkit.ui.OrbotHelper;
@@ -387,7 +388,7 @@ public class SettingsActivity extends Activity {
 						String text = getAgent.getText().toString();
 						mEditPrefs.putString(PreferenceConstants.USER_AGENT_STRING, text);
 						mEditPrefs.commit();
-						mAgentTextView.setText(getResources().getString(R.string.agent_custom));
+						getAgent.setText(getResources().getString(R.string.agent_custom));
 					}
 				});
 		agentStringPicker.show();