diff --git a/res/values/strings.xml b/res/values/strings.xml
index c5feca1..ea162d4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -167,4 +167,5 @@
     <string name="clear_history_exit">Clear history on exit</string>
     <string name="folder_default">Default</string>
     <string name="folder_custom">Custom</string>
+    <string name="untitled">Untititled</string>
 </resources>
diff --git a/src/acr/browser/lightning/Constants.java b/src/acr/browser/lightning/Constants.java
index cb19d8e..e5f47ec 100644
--- a/src/acr/browser/lightning/Constants.java
+++ b/src/acr/browser/lightning/Constants.java
@@ -34,6 +34,6 @@ public class Constants {
 	public static final String HTTP = "http://";
 	public static final String HTTPS = "https://";
 	public static final String FILE = "file://";
-	public static final String LOGTAG = Constants.LOGTAG;
+	public static final String TAG = "Lightning";
 	
 }
diff --git a/src/acr/browser/lightning/LicenseActivity.java b/src/acr/browser/lightning/LicenseActivity.java
index 693a076..1d07520 100644
--- a/src/acr/browser/lightning/LicenseActivity.java
+++ b/src/acr/browser/lightning/LicenseActivity.java
@@ -27,25 +27,26 @@ public class LicenseActivity extends Activity implements View.OnClickListener {
 		findViewById(R.id.licenseAOSP).setOnClickListener(this);
 		findViewById(R.id.licenseHosts).setOnClickListener(this);
 	}
-	
+
 	@Override
-    public void onClick(View v) {
-	    switch (v.getId()) {
-	        case R.id.browserLicense:
-                actionView("http://www.mozilla.org/MPL/2.0/");
-                break;
-	        case R.id.licenseAOSP:
-	            actionView("http://www.apache.org/licenses/LICENSE-2.0");
-                break;
-	        case R.id.licenseHosts:
-	            actionView("http://hosts-file.net/");
-                break;
-        }
-    }
-	
+	public void onClick(View v) {
+		switch (v.getId()) {
+		case R.id.browserLicense:
+			actionView("http://www.mozilla.org/MPL/2.0/");
+			break;
+		case R.id.licenseAOSP:
+			actionView("http://www.apache.org/licenses/LICENSE-2.0");
+			break;
+		case R.id.licenseHosts:
+			actionView("http://hosts-file.net/");
+			break;
+		}
+	}
+
 	private void actionView(String url) {
-	    startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
-        finish();
+		startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url), this,
+				MainActivity.class));
+		finish();
 	}
 
 	@Override
diff --git a/src/acr/browser/lightning/LightningDownloadListener.java b/src/acr/browser/lightning/LightningDownloadListener.java
index 93a4869..734d7f7 100644
--- a/src/acr/browser/lightning/LightningDownloadListener.java
+++ b/src/acr/browser/lightning/LightningDownloadListener.java
@@ -44,7 +44,7 @@ public class LightningDownloadListener implements DownloadListener {
 						dialogClickListener)
 				.setNegativeButton(mActivity.getResources().getString(R.string.action_cancel), dialogClickListener)
 				.show();
-		Log.i(Constants.LOGTAG, "Downloading" + fileName);
+		Log.i(Constants.TAG, "Downloading" + fileName);
 		
 	}
 
diff --git a/src/acr/browser/lightning/SettingsActivity.java b/src/acr/browser/lightning/SettingsActivity.java
index ed8009a..941409c 100644
--- a/src/acr/browser/lightning/SettingsActivity.java
+++ b/src/acr/browser/lightning/SettingsActivity.java
@@ -206,7 +206,7 @@ public class SettingsActivity extends Activity {
 				// NOTE: In order to comply with the open source license,
 				// it is advised that you leave this code so that the License
 				// Activity may be viewed by the user.
-				startActivity(new Intent(Constants.LICENSE_INTENT));
+				startActivity(new Intent(mContext, LicenseActivity.class));
 			}
 
 		});
@@ -231,7 +231,8 @@ public class SettingsActivity extends Activity {
 		}
 		adblock.setChecked(mPreferences.getBoolean(
 				PreferenceConstants.BLOCK_ADS, false));
-		orbot.setChecked(mPreferences.getBoolean(PreferenceConstants.USE_PROXY, false));
+		orbot.setChecked(mPreferences.getBoolean(PreferenceConstants.USE_PROXY,
+				false));
 
 		initSwitch(location, fullScreen, flash, adblock, orbot);
 		clickListenerForSwitches(layoutLocation, layoutFullScreen, layoutFlash,
@@ -427,8 +428,11 @@ public class SettingsActivity extends Activity {
 			public void onClick(View v) {
 				mEasterEggCounter++;
 				if (mEasterEggCounter == 10) {
-					startActivity(new Intent(Intent.ACTION_VIEW, Uri
-							.parse("http://imgs.xkcd.com/comics/compiling.png")));
+
+					startActivity(new Intent(
+							Intent.ACTION_VIEW,
+							Uri.parse("http://imgs.xkcd.com/comics/compiling.png"),
+							mContext, MainActivity.class));
 					finish();
 					mEasterEggCounter = 0;
 				}
@@ -972,7 +976,8 @@ public class SettingsActivity extends Activity {
 
 			@Override
 			public void onClick(View v) {
-				startActivity(new Intent(Constants.ADVANCED_SETTINGS_INTENT));
+				startActivity(new Intent(mContext,
+						AdvancedSettingsActivity.class));
 			}
 
 		});
@@ -984,7 +989,8 @@ public class SettingsActivity extends Activity {
 			@Override
 			public void onClick(View v) {
 				startActivity(new Intent(Intent.ACTION_VIEW, Uri
-						.parse("http://twitter.com/ACRDevelopment")));
+						.parse("http://twitter.com/ACRDevelopment"), mContext,
+						MainActivity.class));
 				finish();
 			}
 
diff --git a/src/acr/browser/lightning/Utils.java b/src/acr/browser/lightning/Utils.java
index 71b6669..60f75dc 100644
--- a/src/acr/browser/lightning/Utils.java
+++ b/src/acr/browser/lightning/Utils.java
@@ -30,7 +30,7 @@ public class Utils {
 		String fileName = URLUtil.guessFileName(url, null,
 				null);
 		DownloadHandler.onDownloadStart(activity, url, userAgent, contentDisposition, null, privateBrowsing);
-		Log.i(Constants.LOGTAG, "Downloading" + fileName);
+		Log.i(Constants.TAG, "Downloading" + fileName);
 	}
 	
 	public static synchronized void addBookmark(Context context, String title, String url) {