diff --git a/src/views/dashboard/controls/Tab.vue b/src/views/dashboard/controls/Tab.vue
index 8105bc5e..3c8a1fe2 100644
--- a/src/views/dashboard/controls/Tab.vue
+++ b/src/views/dashboard/controls/Tab.vue
@@ -56,7 +56,9 @@ limitations under the License. -->
       :row-height="10"
       :is-draggable="true"
       :is-resizable="true"
-      @layout-updated="layoutUpdatedEvent"
+      :vertical-compact="true"
+      :use-css-transforms="true"
+      :responsive="true"
     >
       <grid-item
         v-for="item in dashboardStore.currentTabItems"
@@ -80,7 +82,7 @@ limitations under the License. -->
   </div>
 </template>
 <script lang="ts">
-import { ref, watch, reactive, defineComponent, toRefs } from "vue";
+import { ref, watch, defineComponent, toRefs } from "vue";
 import type { PropType } from "vue";
 import { LayoutConfig } from "@/types/dashboard";
 import { useDashboardStore } from "@/store/modules/dashboard";
@@ -116,7 +118,13 @@ export default defineComponent({
     function clickTabs(e: Event, idx: number) {
       e.stopPropagation();
       activeTabIndex.value = idx;
-      dashboardStore.activeGridItem(idx);
+      dashboardStore.activeGridItem(
+        `${props.data.i}-${activeTabIndex.value}-0`
+      );
+      dashboardStore.setCurrentTabItems(
+        dashboardStore.layout[props.data.i].children[activeTabIndex.value]
+          .children
+      );
     }
     function removeTab(e: Event) {
       e.stopPropagation();
@@ -146,6 +154,14 @@ export default defineComponent({
         `${props.data.i}-${activeTabIndex.value}-${item.i}`
       );
     }
+    function breakpointChangedEvent(newBreakpoint: any, newLayout: any) {
+      console.log(
+        "BREAKPOINT CHANGED breakpoint=",
+        newBreakpoint,
+        ", layout: ",
+        newLayout
+      );
+    }
     document.body.addEventListener("click", handleClick, false);
     watch(
       () => dashboardStore.activedGridItem,
@@ -170,6 +186,7 @@ export default defineComponent({
       removeTab,
       clickTabs,
       layoutUpdatedEvent,
+      breakpointChangedEvent,
       ...toRefs(props),
       activeTabWidget,
       dashboardStore,
diff --git a/src/views/dashboard/controls/Widget.vue b/src/views/dashboard/controls/Widget.vue
index 74ca377c..fd85591b 100644
--- a/src/views/dashboard/controls/Widget.vue
+++ b/src/views/dashboard/controls/Widget.vue
@@ -128,6 +128,9 @@ export default defineComponent({
     watch(
       () => [props.data.metricTypes, props.data.metrics],
       () => {
+        if (!dashboardStore.selectedGrid) {
+          return;
+        }
         if (props.data.i !== dashboardStore.selectedGrid.i) {
           return;
         }
diff --git a/src/views/dashboard/panel/Layout.vue b/src/views/dashboard/panel/Layout.vue
index bc3938f8..ba0c49a7 100644
--- a/src/views/dashboard/panel/Layout.vue
+++ b/src/views/dashboard/panel/Layout.vue
@@ -19,6 +19,7 @@ limitations under the License. -->
     :row-height="10"
     :is-draggable="true"
     :is-resizable="true"
+    :responsive="true"
     @layout-updated="layoutUpdatedEvent"
   >
     <grid-item