diff --git a/attachments_component/site/views/attachments/tmpl/default.php b/attachments_component/site/views/attachments/tmpl/default.php
index 174e7700..0c761a63 100644
--- a/attachments_component/site/views/attachments/tmpl/default.php
+++ b/attachments_component/site/views/attachments/tmpl/default.php
@@ -55,8 +55,9 @@
 	$html .= "\n<div class=\"$this->style\" id=\"$div_id\">\n";
 	}
 
+$html .= "<h3>{$this->title}</h3>";
+
 $html .= "<table>\n";
-$html .= "<caption>{$this->title}</caption>\n";
 
 // Add the column titles, if requested
 if ( $this->show_column_titles ) {
@@ -199,7 +200,7 @@
 				$tooltip = JText::sprintf('ATTACH_ACCESS_THIS_URL_S', $attachment->url);
 				}
 			}
-		$html .= "<a class=\"at_icon\" href=\"$url\"$target title=\"$tooltip\">";
+		$html .= "<a class=\"at_icon\" title=\"icon\">";
 		$html .= JHtml::image('com_attachments/file_icons/'.$icon, $tooltip, null, true);
 		if ( ($attachment->uri_type == 'url') && $this->superimpose_link_icons ) {
 			if ( $attachment->url_valid ) {
@@ -210,7 +211,8 @@
 				}
 			}
 		$html .= "</a>";
-		$html .= "<a class=\"at_url\" href=\"$url\"$target title=\"$tooltip\">$filename</a>";
+		$newurl = str_replace(' ', '%20', $url);
+		$html .= "<a class=\"at_url\" href=\"$newurl\"$target title=\"$tooltip\">$filename</a>";
 		}
 	else {
 		$tooltip = JText::sprintf('ATTACH_DOWNLOAD_THIS_FILE_S', $actual_filename);