diff --git a/SparkleLib/SparkleFetcher.cs b/SparkleLib/SparkleFetcher.cs
index 83f5fa5d..ebbe97d0 100644
--- a/SparkleLib/SparkleFetcher.cs
+++ b/SparkleLib/SparkleFetcher.cs
@@ -130,7 +130,8 @@ namespace SparkleLib {
 		private void InstallExcludeRules ()
 		{
 
-			string exlude_rules_file_path = SparkleHelpers.CombineMore (TargetFolder, ".git", "info", "exclude");
+			string exlude_rules_file_path = SparkleHelpers.CombineMore
+				(TargetFolder, ".git", "info", "exclude");
 
 			TextWriter writer = new StreamWriter (exlude_rules_file_path);
 
@@ -158,7 +159,7 @@ namespace SparkleLib {
 				writer.WriteLine ("Desktop.ini");
 
 				// CVS
-				writer.WriteLine ("*/CVS/*")
+				writer.WriteLine ("*/CVS/*");
 				writer.WriteLine (".cvsignore");
 				writer.WriteLine ("*/.cvsignore");
 				
diff --git a/SparkleLib/SparkleRepo.cs b/SparkleLib/SparkleRepo.cs
index c62484ad..0b15a42e 100644
--- a/SparkleLib/SparkleRepo.cs
+++ b/SparkleLib/SparkleRepo.cs
@@ -652,7 +652,7 @@ namespace SparkleLib {
 	            Commited (this, args);
 			
 			// Collect garbage pseudo-randomly
-			if (DateTime.Now.Second == 0)
+			if (DateTime.Now.Second % 10 == 0)
 				CollectGarbage ();
 
 		}
diff --git a/SparkleShare/Mac/SparkleShare/SparkleIntro.cs b/SparkleShare/Mac/SparkleShare/SparkleIntro.cs
index 5c24e11d..7f15022b 100644
--- a/SparkleShare/Mac/SparkleShare/SparkleIntro.cs
+++ b/SparkleShare/Mac/SparkleShare/SparkleIntro.cs
@@ -394,7 +394,9 @@ namespace SparkleShare {
 					};
 				
 					CancelButton.Activated += delegate {
-						Close ();
+						InvokeOnMainThread (delegate {
+							Close ();
+						});
 					};
 
 					Buttons.Add (CancelButton);
@@ -406,7 +408,9 @@ namespace SparkleShare {
 					};
 				
 					SkipButton.Activated += delegate {
-						ShowCompletedPage ();
+						InvokeOnMainThread (delegate {
+							ShowCompletedPage ();
+						});
 					};
 
 					Buttons.Add (SkipButton);
@@ -432,7 +436,9 @@ namespace SparkleShare {
 				};
 	
 				TryAgainButton.Activated += delegate {
-					ShowServerForm ();
+					InvokeOnMainThread (delegate {
+						ShowServerForm ();
+					});
 				};
 
 
@@ -490,8 +496,10 @@ namespace SparkleShare {
 				};
 
 				FinishButton.Activated += delegate {
-					SparkleUI.StatusIcon.CreateMenu ();
-					Close ();
+					InvokeOnMainThread (delegate {
+						SparkleUI.StatusIcon.CreateMenu ();
+						Close ();
+					});
 				};
 
 			
@@ -531,8 +539,11 @@ namespace SparkleShare {
 				};
 
 				FinishButton.Activated += delegate {
-					SparkleUI.StatusIcon.CreateMenu ();
-					Close ();
+					InvokeOnMainThread (delegate {
+						SparkleUI.StatusIcon.CreateMenu ();
+						Close ();
+					});
+				
 				};			
 				
 				Buttons.Add (FinishButton);
diff --git a/SparkleShare/Mac/SparkleShare/SparkleLog.cs b/SparkleShare/Mac/SparkleShare/SparkleLog.cs
index 5505c129..02dac934 100644
--- a/SparkleShare/Mac/SparkleShare/SparkleLog.cs
+++ b/SparkleShare/Mac/SparkleShare/SparkleLog.cs
@@ -121,11 +121,15 @@ namespace SparkleShare {
 			string html        = SparkleShare.Controller.GetHTMLLog (folder_name);
 			
 			html = html.Replace ("<!-- $body-font-family -->", "Lucida Grande");
-			html = html.Replace ("<!-- $body-font-size -->", "10.1pt");
+			html = html.Replace ("<!-- $body-font-size -->", "13.4px");
 			html = html.Replace ("<!-- $secondary-font-color -->", "#bbb");
+			html = html.Replace ("<!-- $small-color -->", "#ddd");
 			html = html.Replace ("<!-- $day-entry-header-background-color -->", "#f5f5f5");
 			html = html.Replace ("<!-- $a-color -->", "#0085cf");
+			html = html.Replace ("<!-- $no-buddy-icon-background-image -->",
+				"file://" + Path.Combine (NSBundle.MainBundle.ResourcePath, "Pixmaps", "avatar-default.png"));
 			
+			Console.WriteLine (html);
 			WebView.MainFrame.LoadHtmlString (html, new NSUrl (""));
 			
 			Update ();
diff --git a/SparkleShare/SparkleController.cs b/SparkleShare/SparkleController.cs
index 5f536f6c..a88b1c12 100644
--- a/SparkleShare/SparkleController.cs
+++ b/SparkleShare/SparkleController.cs
@@ -919,10 +919,10 @@ namespace SparkleShare {
 
 			} else {
 
-  				TextWriter writer = new StreamWriter (ssh_config_file_path);
+				TextWriter writer = new StreamWriter (ssh_config_file_path);
 				writer.WriteLine (ssh_config);
 				writer.Close ();
-  
+
 			}
 
 		}
@@ -962,9 +962,12 @@ namespace SparkleShare {
 
 		private void DisableHostKeyCheckingForHost (string host)
 		{
-
-			string ssh_config_file_path = Path.Combine (SparklePaths.HomePath, ".ssh", "config");
-			string ssh_config = "Host " + host + "\n\tStrictHostKeyChecking no";
+			
+			string ssh_config_file_path = Path.Combine
+				(SparklePaths.HomePath, ".ssh", "config");
+			
+			string ssh_config = "Host " + host + "\n" +
+			                    "\tStrictHostKeyChecking no";
 
 			if (File.Exists (ssh_config_file_path)) {
 
@@ -986,28 +989,31 @@ namespace SparkleShare {
 		private void EnableHostKeyCheckingForHost (string host)
 		{
 
-			string ssh_config_file_path = Path.Combine (SparklePaths.HomePath, ".ssh", "config");
-			string ssh_config = "Host " + host + "\n\tStrictHostKeyChecking no";
+			string ssh_config_file_path = Path.Combine
+				(SparklePaths.HomePath, ".ssh", "config");
+			
+			string ssh_config = "Host " + host + "\n" +
+			                    "\tStrictHostKeyChecking no";
 
 			if (File.Exists (ssh_config_file_path)) {
 
 				StreamReader reader = new StreamReader (ssh_config_file_path);
 				string current_ssh_config = reader.ReadToEnd ();
 				reader.Close ();
-				
-				if (current_ssh_config.Equals (ssh_config)) {
-				
-  					File.Delete (ssh_config_file_path);
+  				
+   				current_ssh_config = current_ssh_config.Remove (current_ssh_config.IndexOf (ssh_config),
+   					ssh_config.Length);
+
+				if (current_ssh_config.Trim ().Equals ("")) {
+	
+					File.Delete (ssh_config_file_path);
 				
 				} else {
-  				
-   					current_ssh_config = current_ssh_config.Remove (current_ssh_config.IndexOf (ssh_config),
-   						ssh_config.Length);
-     		
+	
 					TextWriter writer = new StreamWriter (ssh_config_file_path);
 					writer.WriteLine (current_ssh_config);
 					writer.Close ();
-
+					
 				}
 
 			}
@@ -1075,7 +1081,7 @@ namespace SparkleShare {
 				} catch (Exception e) {
 
 					SparkleHelpers.DebugInfo ("Controller", "Error moving folder: " + e.Message);
-
+ 
 				}
 
 				
@@ -1097,11 +1103,12 @@ namespace SparkleShare {
 					SparkleHelpers.ClearAttributes (tmp_folder);
 					Directory.Delete (tmp_folder, true);
 
-					SparkleHelpers.DebugInfo ("Config", "Deleted temporary directory: " + tmp_folder);
+					SparkleHelpers.DebugInfo ("Config",
+						"Deleted temporary directory: " + tmp_folder);
 
 				}
 
-					
+
 				if (FolderFetchError != null)
 					FolderFetchError ();
 
diff --git a/data/avatar-default.png b/data/avatar-default.png
new file mode 100644
index 00000000..b4f31d43
Binary files /dev/null and b/data/avatar-default.png differ
diff --git a/data/html/event-entry.html b/data/html/event-entry.html
index 73e0afd7..5b321499 100644
--- a/data/html/event-entry.html
+++ b/data/html/event-entry.html
@@ -4,7 +4,11 @@
 
 		<table>
 			<tr>
-				<td><img src='<!-- $event-avatar-url -->'></td>
+				<td>
+					<div class='no-buddy-icon'>
+						<div class='buddy-icon' style='background-image: url("<!-- $event-avatar-url -->")'></div>
+					</div>
+				</td>
 				<td width='100%'>
 					<b><!-- $event-user-name --></b><br>
 					<!-- $event-entry-content -->
diff --git a/data/html/event-log.html b/data/html/event-log.html
index e8aebd06..e14058b5 100644
--- a/data/html/event-log.html
+++ b/data/html/event-log.html
@@ -8,12 +8,13 @@
 		<style>
 
 			body {
-				background-color: <!-- $body-background-color -->;
+				background-color: #f1f1f1;
 				color:            <!-- $body-color -->;
 				font-size:        <!-- $body-font-size -->;
 				font-family:      <!-- $body-font-family -->;
 				margin:           0;
 				padding:          0;
+				margin-top:       20px;
 			}
 
 			small {
@@ -22,8 +23,15 @@
 			}
 
 			.day-entry-header {
-				background-color: <!-- $day-entry-header-background-color -->;
-				padding:          9px;
+				background-color:      #ccc;
+				color:                 #f7f7f7;
+				padding:               3px;
+				text-align:            center;
+				margin-left:           auto;
+				margin-right:          auto;
+				-webkit-border-radius: 20px;
+				width:                 128px;
+				font-weight:           lighter;
 			}
 			
 			.day-entry-content {
@@ -43,7 +51,7 @@
 			
 			dd {
 				padding-left: 0;
-				margin-left: 9px;
+				margin-left: 12px;
 				text-overflow: ellipsis;
 			}
 			
@@ -64,13 +72,28 @@
 				font-size: 80%;
 				color:     <!-- $secondary-font-color -->;
 			}
-			
-			img {
-				margin-right:     12px;
+
+			.no-buddy-icon {
+				margin-right:        12px;
+				width:               36px;
+				height:              36px;
+				background-image:    url('<!-- $no-buddy-icon-background-image -->');
+				background-repeat:   no-repeat;
+				background-position: center; 
+			}
+
+			.buddy-icon {
 				width:            36px;
 				height:           36px;
-				background-color: <!-- $small-color -->;
-			}	
+			}
+
+			.event-entry-content {
+				background-color:      #fff;
+				margin:                12px;
+				padding:               12px;
+				-webkit-border-radius: 6px;
+				border:                <!-- $small-color --> 1px solid;
+			}
 
 		</style>
 
diff --git a/data/side-splash.png b/data/side-splash.png
index 21de89e0..47ae13ec 100644
Binary files a/data/side-splash.png and b/data/side-splash.png differ