diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index be3c43f5..ad48d9d4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -31,6 +31,7 @@
       	
       	<activity android:name=".LotsaText"/>
       	<activity android:name=".Permissions"/>
+      	<activity android:name=".TipsAndTricks"/>
       	<activity android:name=".SettingsPreferences"  android:label="@string/app_name"/>
         <activity android:name=".AppManager"  android:label="@string/app_name"/>
         <activity android:name=".WizardActivity"  android:label="@string/app_name"/>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 25e253d8..0bf8286f 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -138,6 +138,7 @@
 	<string name="wizard_permissions_root_msg2">If you choose to continue without providing superuser privileges, make sure to use apps made to work with orbot</string>
 	<string name="wizard_permissions_msg">Orbot has detected that you do not have root permissions.\nTransparent Proxying is not possible without superuser privileges.\nMake sure to use apps that have been configured to work with Orbot</string>
 	<!-- TipsAndTricks screen -->
+	<string name="wizard_tips_title">Orbot configured Apps</string>
 	<string name="wizard_tips_gibberbot">Gibberbot - Secure instant messaging client for Android</string>
 	<string name="wizard_tips_firefox">Firefox - Android browser - To be used along with ProxyMob Add-on </string>
 	<string name="wizard_tips_proxymob">ProxyMob - Simple Firefox Add-on for setting HTTP, SOCKS and SSL proxy settings</string>
diff --git a/src/org/torproject/android/TipsAndTricks.java b/src/org/torproject/android/TipsAndTricks.java
index c4aba967..a3aa1ef7 100644
--- a/src/org/torproject/android/TipsAndTricks.java
+++ b/src/org/torproject/android/TipsAndTricks.java
@@ -8,6 +8,7 @@ import android.os.Bundle;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+import android.widget.TextView;
 
 public class TipsAndTricks extends Activity implements TorConstants {
 
@@ -26,7 +27,7 @@ public class TipsAndTricks extends Activity implements TorConstants {
 		super.onStart();
 		setContentView(R.layout.layout_wizard_tips);
 		
-		//stepFive();
+		stepFive();
         
 	}
 	
@@ -39,8 +40,10 @@ public class TipsAndTricks extends Activity implements TorConstants {
 	
 	void stepFive(){
 		
-		
-        
+		String title = context.getString(R.string.wizard_tips_title);
+		TextView txtTitle  = ((TextView)findViewById(R.id.WizardTextTitle));
+		txtTitle.setText(title);
+		 
         Button btn1 = (Button)findViewById(R.id.WizardRootButtonInstallGibberbot);
         
         btn1.setOnClickListener(new OnClickListener() {
diff --git a/src/org/torproject/android/WizardHelper.java b/src/org/torproject/android/WizardHelper.java
index c3fa3c08..684a7300 100644
--- a/src/org/torproject/android/WizardHelper.java
+++ b/src/org/torproject/android/WizardHelper.java
@@ -215,7 +215,7 @@ public class WizardHelper implements TorConstants {
 		LayoutInflater li = LayoutInflater.from(context);
         View view = li.inflate(R.layout.layout_wizard_tips, null); 
         
-        Button btn1 = (Button)view.findViewById(R.id.WizardRootButtonInstallOtrchat);
+        Button btn1 = (Button)view.findViewById(R.id.WizardRootButtonInstallGibberbot);
         
         btn1.setOnClickListener(new OnClickListener() {
 			
@@ -228,7 +228,7 @@ public class WizardHelper implements TorConstants {
 			}
 		});
         
-        Button btn2 = (Button)view.findViewById(R.id.WizardRootButtonInstallOrweb);
+        Button btn2 = (Button)view.findViewById(R.id.WizardRootButtonInstallFirefox);
 
         btn2.setOnClickListener(new OnClickListener() {
 			
@@ -241,7 +241,7 @@ public class WizardHelper implements TorConstants {
 			}
 		});
         
-        Button btn3 = (Button)view.findViewById(R.id.WizardRootButtonProxyHelp);
+        Button btn3 = (Button)view.findViewById(R.id.WizardRootButtonInstallProxyMob);
         
         btn3.setOnClickListener(new OnClickListener() {