diff --git a/caravel/templates/caravel/explore.html b/caravel/templates/caravel/explore.html
index d79e75d8c195..7c63f83a7f98 100644
--- a/caravel/templates/caravel/explore.html
+++ b/caravel/templates/caravel/explore.html
@@ -50,17 +50,14 @@
               {% endfor %}
             </select>
           </span>
-          <span class="label-bordered">
-            <a href="{{ datasource.url }}" data-toggle="tooltip" title="Edit/configure datasource">
-              &nbsp;
-              <i class="fa fa-edit"></i>&nbsp;
-            </a>
-          </span>
+          <a href="{{ datasource.url }}" class="btn btn-default-outline" data-toggle="tooltip" title="Edit/configure datasource">
+            <i class="fa fa-edit"></i>&nbsp;
+          </a>
           <span title="Visualization Type" data-toggle="tooltip">
             {{ form.get_field("viz_type")(class_="select2-with-images") }}
           </span>
           {% if slice %}
-            <span class="label-bordered" title="Slice" data-toggle="tooltip" data-placement="bottom">
+            <span class="btn btn-default notbtn" title="Slice" data-toggle="tooltip" data-placement="bottom">
                 <span class="favstar" class_name="Slice" obj_id="{{ slice.id }}"></span>
                 {{ slice.slice_name }}
                 <a class="" href="/slicemodelview/edit/{{ slice.id }}" data-toggle="tooltip" title="Edit">
diff --git a/caravel/views.py b/caravel/views.py
index 9c4b1cbf1061..fcdecd5f70a9 100644
--- a/caravel/views.py
+++ b/caravel/views.py
@@ -908,7 +908,7 @@ def save_or_overwrite_slice(
         dash = None
         if request.args.get('add_to_dash') == 'existing':
             dash = (
-                db.session.query(models.Dashoard)
+                db.session.query(models.Dashboard)
                 .filter_by(id=int(request.args.get('save_to_dashboard_id')))
                 .one()
             )
@@ -918,7 +918,7 @@ def save_or_overwrite_slice(
                     dash.dashboard_title),
                 "info")
         elif request.args.get('add_to_dash') == 'new':
-            dash = models.Dashoard(
+            dash = models.Dashboard(
                 dashboard_title=request.args.get('new_dashboard_name'),
                 owners=[g.user] if g.user else [])
             flash(