diff --git a/SparkleShare/SparkleIntro.cs b/SparkleShare/SparkleIntro.cs
index cd6fb77f..45cd2122 100644
--- a/SparkleShare/SparkleIntro.cs
+++ b/SparkleShare/SparkleIntro.cs
@@ -167,7 +167,7 @@ namespace SparkleShare {
 		}
 
 
-		private void ShowStepTwo ()
+		public void ShowStepTwo ()
 		{
 
 			Title = _("Add Remote Folder");
@@ -199,35 +199,41 @@ namespace SparkleShare {
 
 							HBox layout_server = new HBox (true, 0);
 
-								ServerEntry = new Entry ("ssh://gitorious.org/sparkleshare");
-
-								RadioButton radio_button = new RadioButton ("<b>" + _("On my own server:") + "</b>") {
-									Xalign    = 0
-								};
+								ServerEntry = new Entry ("ssh://server.org/");
 
+								RadioButton radio_button = new RadioButton ("<b>" + _("On my own server:") + "</b>");
 							layout_server.Add (radio_button);							
 							layout_server.Add (ServerEntry);
 							
+							string github_text = "<b>" + "Github" + "</b>\n" +
+								  "<span fgcolor='#777' size='small'>" +
+								_("Github provides free hosting for Open Source projects, ") + 
+								_("but also has paid accounts for extra space and bandwidth.") +
+								  "</span>";
 
-							RadioButton radio_button_github = new RadioButton (radio_button, "<b>" + _("Github") + "</b>\n" +
-								"<span fgcolor='#777'><small>Github provides free hosting for Open Source projects, " + 
-								"but also has paid accounts for extra space and bandwidth.</small></span>") {
-								Xalign    = 0
-							};
+							RadioButton radio_button_github = new RadioButton (radio_button, github_text);
 							
 							(radio_button_github.Child as Label).UseMarkup = true;
 							(radio_button_github.Child as Label).Wrap      = true;
 
-							RadioButton radio_button_gnome = new RadioButton (radio_button, "<b>" + _("The GNOME Project") + "</b>\n" +
-								"<span fgcolor='#777'><small>GNOME is an easy to understand interface to your computer. Select this option if you’re a developer or designer working on GNOME.</small></span>") {
-								Xalign    = 0
-							};
-							
+							string gnome_text = "<b>" + _("The GNOME Project") + "</b>\n" +
+								  "<span fgcolor='#777' size='small'>" +
+								_("GNOME is an easy to understand interface to your computer.") +
+								_("Select this option if you’re a developer or designer working on GNOME.") +
+								  "</span>";
+
+							RadioButton radio_button_gnome = new RadioButton (radio_button, gnome_text);
+
 							(radio_button_gnome.Child as Label).UseMarkup = true;
 							(radio_button_gnome.Child as Label).Wrap      = true;
 
-							RadioButton radio_button_gitorious = new RadioButton (radio_button, "<b>" + _("Gitorious") + "</b>\n" +
-								"<span fgcolor='#777'><small>Gitorious provides a completely Free and Open Source infrastructure for hosting Open Source projects.</small></span>") {
+							string gitorious_text = "<b>" + _("Gitorious") + "</b>\n" +
+								  "<span fgcolor='#777' size='small'>" +
+								_("Gitorious provides a completely Free and Open Source infrastructure ") +
+								_("for hosting Open Source projects.") +
+								  "</span>";
+
+							RadioButton radio_button_gitorious = new RadioButton (radio_button, gitorious_text) {
 								Xalign    = 0
 							};
 							
@@ -495,6 +501,7 @@ namespace SparkleShare {
 
 		}
 
+
 		// Checks to see if an email address is valid
 		private bool IsValidEmail(string email)
 		{
@@ -504,6 +511,7 @@ namespace SparkleShare {
 
 		}
 
+
 		// Checks if a url is a valid git url
 		private static bool IsGitUrl (string url)
 		{
@@ -528,6 +536,7 @@ namespace SparkleShare {
 			return url;
 		
 		}
+
 	}
 
 }
diff --git a/SparkleShare/SparkleRepo.cs b/SparkleShare/SparkleRepo.cs
index ab0f51ab..b546864b 100644
--- a/SparkleShare/SparkleRepo.cs
+++ b/SparkleShare/SparkleRepo.cs
@@ -97,7 +97,7 @@ namespace SparkleShare {
 
 			// Fetch remote changes every minute
 			FetchTimer = new Timer () {
-				Interval = 30000
+				Interval = 5000
 			};
 
 			FetchTimer.Elapsed += delegate { 
diff --git a/SparkleShare/SparkleStatusIcon.cs b/SparkleShare/SparkleStatusIcon.cs
index 6cc3be5c..030b96a1 100644
--- a/SparkleShare/SparkleStatusIcon.cs
+++ b/SparkleShare/SparkleStatusIcon.cs
@@ -172,8 +172,9 @@ namespace SparkleShare {
 
 					add_item.Activated += delegate {
 
-//						SparkleDialog dialog = new SparkleDialog ("");
-//						dialog.ShowAll ();
+						SparkleIntro intro = new SparkleIntro ();
+						intro.ShowStepTwo ();
+						intro.ShowAll ();
 
 					};
 
diff --git a/SparkleShare/SparkleUI.cs b/SparkleShare/SparkleUI.cs
index 5103dffa..170fd073 100644
--- a/SparkleShare/SparkleUI.cs
+++ b/SparkleShare/SparkleUI.cs
@@ -74,7 +74,7 @@ namespace SparkleShare {
 			if (!HideUI) {
 
 				// Show the intro screen if there are no folders
-				if (Repositories.Count != 0) { //TODO: CHANGE THIS BACK LATER
+				if (Repositories.Count == 0) {
 
 					SparkleIntro intro = new SparkleIntro ();
 					intro.ShowAll ();
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 4011dc98..1f78d471 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -4,7 +4,6 @@ hicolordir = $(DESTDIR)$(datadir)/icons/hicolor
 
 theme_icons =						\
 	animations,process-syncing-sparkleshare-24.png	\
-	animations,process-working-48.png		\
 	places,folder-16.png				\
 	places,folder-22.png				\
 	places,folder-24.png				\
diff --git a/data/icons/process-working-48.png b/data/icons/process-working-48.png
deleted file mode 100644
index 3ab6b632..00000000
Binary files a/data/icons/process-working-48.png and /dev/null differ