diff --git a/webui/src/bug/Message.js b/webui/src/bug/Message.js
index 612a9563ff3810144db9208ae72474d64d5f266a..2a96e52d8c85004b6536ab0f3647ead9bb4584cb 100644
--- a/webui/src/bug/Message.js
+++ b/webui/src/bug/Message.js
@@ -23,6 +23,7 @@ const styles = theme => ({
     backgroundColor: '#fff',
     minHeight: 50,
     padding: 5,
+    whiteSpace: 'pre-wrap',
   }
 })
 
diff --git a/webui/src/list/BugRow.js b/webui/src/list/BugRow.js
index dba498d22be062711d786f7078cb43b898f023a0..9f55809d8f41a0d3dd4d758022610b7041f37461 100644
--- a/webui/src/list/BugRow.js
+++ b/webui/src/list/BugRow.js
@@ -32,7 +32,10 @@ const Status = ({status, className}) => {
 const styles = theme => ({
   cell: {
     display: 'flex',
-    alignItems: 'center'
+    alignItems: 'center',
+    '& a': {
+      textDecoration: 'none'
+    }
   },
   status: {
     margin: 10
@@ -41,11 +44,11 @@ const styles = theme => ({
     width: '100%'
   },
   title: {
-    display: 'inline-block',
-    textDecoration: 'none'
+    display: 'inline',
   },
   labels: {
-    display: 'inline-block',
+    ...theme.typography.body2,
+    display: 'inline',
     paddingLeft: theme.spacing.unit,
   }
 })
@@ -57,15 +60,16 @@ const BugRow = ({bug, classes}) => (
       <div className={classes.expand}>
         <Link to={'bug/' + bug.humanId}>
           <div className={classes.expand}>
-
             <Typography variant={'title'} className={classes.title}>
               {bug.title}
             </Typography>
-            <span className={classes.labels}>
-              {bug.labels.map(l => (
-                <Label key={l} label={l}/>
-              ))}
-            </span>
+            { bug.labels.length > 0 && (
+              <span className={classes.labels}>
+                {bug.labels.map(l => (
+                  <Label key={l} label={l}/>
+                ))}
+              </span>
+            )}
           </div>
         </Link>
         <Typography color={'textSecondary'}>