diff --git a/src/Template/Main/address.ctp b/src/Template/Main/address.ctp
index 04057fd..08285c0 100644
--- a/src/Template/Main/address.ctp
+++ b/src/Template/Main/address.ctp
@@ -125,21 +125,21 @@
     </div>
 
     <div class="address-summary">
+        <div class="box">
+            <div class="title">Balance (LBC)</div>
+            <div class="value"><?php echo $this->Amount->format($balanceAmount) ?></div>
+        </div>
+
         <div class="box">
             <div class="title">Received (LBC)</div>
             <div class="value"><?php echo $this->Amount->format($totalReceived) ?></div>
         </div>
 
-        <div class="box">
+        <div class="box last">
             <div class="title">Sent (LBC)</div>
             <div class="value"><?php echo $this->Amount->format($totalSent) ?></div>
         </div>
 
-        <div class="box last">
-            <div class="title">Balance (LBC)</div>
-            <div class="value"><?php echo $this->Amount->format($balanceAmount) ?></div>
-        </div>
-
         <div class="clear"></div>
     </div>
 
diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp
index a304ad1..21d6fd0 100644
--- a/src/Template/Main/claims.ctp
+++ b/src/Template/Main/claims.ctp
@@ -42,7 +42,7 @@ $a = ['purple', 'orange', 'blue', 'teal', 'green', 'yellow'];
 $autoThumbText = '';
 $link = $claim->Name;
 if (isset($claim->Publisher->Name)) {
-    $link = $claim->Publisher->Name . '/' . $link;
+    $link = urlencode($claim->Publisher->Name) . '/' . $link;
 }
 $link = 'lbry://' . $link;
 if ($claim->ClaimType == 1) { $autoThumbText = strtoupper(substr($claim->Name, 1, min( strlen($claim->Name), 10 ))); } else {
@@ -164,7 +164,7 @@ if (strlen(trim($desc)) == 0) {
             $autoThumbText = '';
             $link = $claim->Name;
             if (isset($claim->Publisher->Name)) {
-                $link = $claim->Publisher->Name . '/' . $link;
+                $link = urlencode($claim->Publisher->Name) . '/' . $link;
             }
             $link = 'lbry://' . $link;
             $cost = '';
@@ -287,7 +287,7 @@ if (strlen(trim($desc)) == 0) {
         $autoThumbText = '';
         $link = $claim->Name;
         if (isset($claim->Publisher->Name)) {
-            $link = $claim->Publisher->Name . '/' . $link;
+            $link = urlencode($claim->Publisher->Name) . '/' . $link;
         }
         $link = 'lbry://' . $link;