diff --git a/src/Template/Main/claims.ctp b/src/Template/Main/claims.ctp
index db16b38..89656c1 100644
--- a/src/Template/Main/claims.ctp
+++ b/src/Template/Main/claims.ctp
@@ -217,8 +217,8 @@ if (strlen(trim($desc)) == 0) {
             </div>
 
             <div class="metadata">
-                <div class="title"><?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '<em>No Title</em>') ?></div>
-                <div class="link"><a href="<?php echo $link ?>" rel="nofollow"><?php echo $link ?></a></div>
+                <div class="title" title="<?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '') ?>"><?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '<em>No Title</em>') ?></div>
+                <div class="link" title="<?php echo $link ?>><a href="<?php echo $link ?>" rel="nofollow"><?php echo $link ?></a></div>
 
                 <div class="desc"><?php echo strlen(trim($claim->Description)) > 0 ? $claim->Description : '<em>No description available</em>' ?></div>
 
@@ -236,21 +236,20 @@ if (strlen(trim($desc)) == 0) {
                 <div class="label half-width">Content type</div>
                 <div class="label half-width">Language</div>
 
-                <div class="value half-width"><?php echo $claim->ContentType ?></div>
-                <div class="value half-width"><?php echo $claim->Language == 'en' ? 'English' : $claim->Language ?></div>
+                <div class="value half-width" title="<?php echo $claim->ContentType ?>"><?php echo $claim->ContentType ?></div>
+                <div class="value half-width" title="<?php echo $claim->Language == 'en' ? 'English' : $claim->Language ?>"><?php echo $claim->Language == 'en' ? 'English' : $claim->Language ?></div>
 
                 <div class="clear spacer"></div>
 
                 <div class="label half-width">Author</div>
                 <div class="label half-width">License</div>
 
-                <div class="value half-width"><?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?></div>
-                <div class="value half-width">
+                <div class="value half-width" title="<?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?></div>
+                <div class="value half-width" title="<?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '' ?>">
                     <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
                     <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
                     <?php if (strlen(trim($claim->LicenseUrl))): ?></a><?php endif; ?>
                 </div>
-
                 <?php endif; ?>
 
             </div>
@@ -352,23 +351,21 @@ if (strlen(trim($desc)) == 0) {
             <div class="label half-width">Content type</div>
             <div class="label half-width">Language</div>
 
-            <div class="value half-width"><?php echo $claim->ContentType ?></div>
-            <div class="value half-width"><?php echo $claim->Language == 'en' ? 'English' : $claim->Language ?></div>
+            <div class="value half-width" title="<?php echo $claim->ContentType ?>"><?php echo $claim->ContentType ?></div>
+            <div class="value half-width" title="<?php echo $claim->Language == 'en' ? 'English' : $claim->Language ?>"><?php echo $claim->Language == 'en' ? 'English' : $claim->Language ?></div>
 
             <div class="clear spacer"></div>
 
             <div class="label half-width">Author</div>
             <div class="label half-width">License</div>
 
-            <div class="value half-width"><?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?></div>
-            <div class="value half-width">
+            <div class="value half-width" title="<?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?>"><?php echo strlen(trim($claim->Author)) > 0 ? $claim->Author : '<em>Unspecified</em>' ?></div>
+            <div class="value half-width" title="<?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '' ?>">
                 <?php if (strlen(trim($claim->LicenseUrl)) > 0): ?><a href="<?php echo $claim->LicenseUrl ?>" rel="nofollow" target="_blank"><?php endif; ?>
                 <?php echo strlen(trim($claim->License)) > 0 ? $claim->License : '<em>Unspecified</em>' ?>
                 <?php if (strlen(trim($claim->LicenseUrl))): ?></a><?php endif; ?>
             </div>
-
             <?php endif; ?>
-
         </div>
     </div>
     <?php $idx++; endforeach; ?>
diff --git a/src/Template/Main/index.ctp b/src/Template/Main/index.ctp
index 44bf240..fa502da 100644
--- a/src/Template/Main/index.ctp
+++ b/src/Template/Main/index.ctp
@@ -219,7 +219,7 @@
                 </div>
 
                 <div class="metadata">
-                    <div class="title"><?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '<em>No Title</em>') ?></div>
+                    <div class="title" title="<?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : ''); ?>"><?php echo $claim->ClaimType == 1 ? $claim->Name : ((strlen(trim($claim->Title)) > 0) ? $claim->Title : '<em>No Title</em>') ?></div>
                     <div class="link"><a href="<?php echo $link ?>"><?php echo $link ?></a></div>
 
                     <div class="clear"></div>
diff --git a/webroot/css/main.css b/webroot/css/main.css
index 1ec6ed2..09e8d71 100644
--- a/webroot/css/main.css
+++ b/webroot/css/main.css
@@ -47,7 +47,7 @@ border-radius: 0 6px 8px 0 }
 .home-container-cell .recent-claims .claim-box .tags .nsfw { background: #e53935; text-align: center; color: #fff; position: relative; left: 1px }
 .home-container-cell .recent-claims .claim-box .tags .content-type { background: #880e4f; text-align: center; color: #fff; }
 .home-container-cell .recent-claims .claim-box .metadata { padding: 12px; font-size: 90% }
-.home-container-cell .recent-claims .claim-box .title { font-size: 120%; height: 25px; line-height: 25px; overflow: hidden; text-overflow: ellipsis }
+.home-container-cell .recent-claims .claim-box .title { font-size: 120%; height: 25px; line-height: 25px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap }
 .home-container-cell .recent-claims .claim-box .desc { font-size: 80%; font-weight: 300; height: 100px; overflow: hidden; text-overflow: ellipsis; margin: 3px 0; line-height: 20px }
 .home-container-cell .recent-claims .claim-box .link { font-size: 80%; font-weight: 300; margin-top: 3px; overflow: hidden; text-overflow: ellipsis; line-height: 20px; height: 20px }
 .home-container-cell .recent-claims .claim-box .tx-link { font-size: 80%; font-weight: 300; color: #fff; background: #1e88e5; position: absolute; bottom: 0; width: 100%; display: block; line-height: 20px; height: 32px; padding: 6px 0; text-align: center; cursor: pointer  }
@@ -79,7 +79,7 @@ border-radius: 0 6px 8px 0 }
 .claims-grid .claim-grid-item .tags .nsfw { background: #e53935; text-align: center; color: #fff; position: relative; left: 1px }
 .claims-grid .claim-grid-item .tags .content-type { background: #880e4f; text-align: center; color: #fff; }
 .claims-grid .claim-grid-item .metadata { padding: 24px; font-size: 90% }
-.claims-grid .claim-grid-item .title { font-size: 120%; height: 25px; line-height: 25px; overflow: hidden; text-overflow: ellipsis }
+.claims-grid .claim-grid-item .title { font-size: 120%; height: 25px; line-height: 25px; overflow: hidden; text-overflow: ellipsis; white-space: nowrap }
 .claims-grid .claim-grid-item .desc { font-size: 90%; font-weight: 300; height: 72px; overflow: hidden; text-overflow: ellipsis; margin: 8px 0 20px 0; line-height: 24px }
 .claims-grid .claim-grid-item .link { font-size: 95%; font-weight: 300; margin-top: 3px; overflow: hidden; text-overflow: ellipsis; line-height: 20px; height: 20px; margin-top: 6px }