diff --git a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
index 401f4fef4f..408f640c01 100644
--- a/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/components/content/umb-tabbed-content.html
@@ -1,6 +1,6 @@
 <div>
     <ng-form name="tabbedContentForm">
-        <div class="umb-expansion-panel" data-element="property-{{group.alias}}" ng-repeat="group in content.tabs track by group.label">
+        <div class="umb-expansion-panel" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs track by group.label">
 
             <div class="umb-expansion-panel__header" ng-click="group.open = !group.open">
                 <div>{{ group.label }}</div>
diff --git a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
index c0e2c2ae33..358dcef27d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
+++ b/src/Umbraco.Web.UI.Client/src/views/media/apps/content/content.html
@@ -1,5 +1,5 @@
 <div class="form-horizontal" ng-controller="Umbraco.Editors.Media.Apps.ContentController as vm">
-    <div class="umb-expansion-panel" ng-repeat="group in content.tabs | filter: { hide : '!' + true }">
+    <div class="umb-expansion-panel" data-element="group-{{group.alias}}" ng-repeat="group in content.tabs | filter: { hide : '!' + true }">
 
         <div class="umb-expansion-panel__header" ng-click="group.open = !group.open">
             <div>{{ group.label }}</div>
@@ -7,7 +7,7 @@
         </div>
 
         <div class="umb-expansion-panel__content" ng-show="group.open">
-            <umb-property data-element="property-{{group.alias}}" ng-repeat="property in group.properties" property="property">
+            <umb-property data-element="property-{{property.alias}}" ng-repeat="property in group.properties" property="property">
                 <umb-property-editor model="property"></umb-property-editor>
             </umb-property>
         </div>
diff --git a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
index 0dd79e7446..216b5153fd 100644
--- a/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
+++ b/src/Umbraco.Web.UI/config/BackOfficeTours/getting-started.json
@@ -467,7 +467,7 @@
                 "content": "<p>You will also find other details about the image, like the size.</p><p>Media items work in much the same way as content. So you can add extra properties to an image by creating or editing the <b>Media types</b> in the Settings section.</p>"
             },
             {
-                "element": "[data-element='editor-media'] [data-element='tab-_umb_infoTab']",
+                "element": "[data-element='editor-media'] [data-element='sub-view-info']",
                 "title": "Info",
                 "content": "Like the content section you can also find default information about the media item. You will find these under the info tab.",
                 "event": "click"