diff --git a/hub/httpd.conf b/hub/httpd.conf
index b3a55503..84965f87 100644
--- a/hub/httpd.conf
+++ b/hub/httpd.conf
@@ -3,7 +3,6 @@
 #
 
 Alias /kojihub "/usr/share/koji-hub/XMLRPC"
-Alias /koji-hub "/usr/share/koji-hub/XMLRPC"
 
 <Directory /usr/share/koji-hub>
         SetHandler mod_python
diff --git a/www/kojiweb/taskinfo.chtml b/www/kojiweb/taskinfo.chtml
index f1b55d83..a2266a70 100644
--- a/www/kojiweb/taskinfo.chtml
+++ b/www/kojiweb/taskinfo.chtml
@@ -1,5 +1,6 @@
 #import koji
 #from kojiweb import util
+#import urllib
 
 #def printValue($key, $value, $sep=', ')
   #if $key == 'brootid'
@@ -276,7 +277,7 @@ $result.faultString.strip()
       <th>Output</th>
       <td>
         #for $filename in $output
-        <a href="getfile?taskID=$task.id&name=$filename">$filename</a><br/>
+        <a href="getfile?taskID=$task.id&name=$urllib.quote($filename)">$filename</a><br/>
         #end for
         #if $task.state not in ($koji.TASK_STATES.CLOSED, $koji.TASK_STATES.CANCELED, $koji.TASK_STATES.FAILED) and \
             $task.method in ('buildSRPMFromCVS', 'buildArch', 'runroot')
diff --git a/www/static/koji.css b/www/static/koji.css
index 3f65f63b..11bb8b76 100644
--- a/www/static/koji.css
+++ b/www/static/koji.css
@@ -57,8 +57,8 @@ a:hover {
 }
 
 div#content {
-    margin: 0px 20px 0px 20px;
-    float: left;
+    margin: 0 20px;
+    clear: both;
 }
 
 p#footer {
@@ -81,7 +81,6 @@ p#footer a {
 #mainNav {
     width: 100%;
     background-color: #009;
-    margin-bottom: 5px;
     font-weight: bold;
     font-family: verdana, helvetica, arial, sans-serif;
     height: 2.1em;
@@ -136,7 +135,7 @@ h4 {
     color: #fff;
     background-color: #006;
     padding: 0.3em;
-    margin: 5px 0px 5px 0px;
+    margin: 0px;
 }
 
 h4 a {
@@ -402,7 +401,5 @@ abbr {
 span#loginInfo {
     float: right;
     font-weight: bold;
-    margin-left: 0.5em;
-    margin-right: 0.5em;
-    margin-bottom: 4px;
+    margin: 5px;
 }