diff --git a/app/static/app/js/components/LayersControlPanel.jsx b/app/static/app/js/components/LayersControlPanel.jsx
index 5bd235cc..9131dd19 100644
--- a/app/static/app/js/components/LayersControlPanel.jsx
+++ b/app/static/app/js/components/LayersControlPanel.jsx
@@ -34,7 +34,7 @@ export default class LayersControlPanel extends React.Component {
             const m_a = a[Symbol.for("meta")] || {};
             const m_b = b[Symbol.for("meta")] || {};
             return m_a.name > m_b.name ? -1 : 1;
-        }).map((layer, i) => <LayersControlLayer map={this.props.map} expanded={this.props.layers.length === 1} overlay={false} layer={layer} key={i} />)}
+        }).map((layer, i) => <LayersControlLayer map={this.props.map} expanded={this.props.layers.length === 1} overlay={false} layer={layer} key={(layer[Symbol.for("meta")] || {}).name || i} />)}
       </div>);
     }
 
diff --git a/app/static/app/js/css/TaskListItem.scss b/app/static/app/js/css/TaskListItem.scss
index 37bf0108..74847d58 100644
--- a/app/static/app/js/css/TaskListItem.scss
+++ b/app/static/app/js/css/TaskListItem.scss
@@ -40,10 +40,12 @@
 
     .status-label{
         padding: 4px;
+        padding-left: 8px;
         width: 100%;
         font-size: 90%;
         border-style: solid;
         border-width: 1px;
+        border-radius: 2px;
     }
 
     .clickable:hover{