diff --git a/cypress/e2e/view-filtering-selection.cy.js b/cypress/e2e/view-filtering-selection.cy.js
index fb5af31b14..87e514898f 100644
--- a/cypress/e2e/view-filtering-selection.cy.js
+++ b/cypress/e2e/view-filtering-selection.cy.js
@@ -25,57 +25,57 @@ describe('Filtering in a view by selection columns', () => {
 		cy.createSelectionCheckColumn('check', null, false)
 
 		// add row
-		cy.get('button').contains('Create row').click()
+		cy.get('[data-cy="createRowBtn"]').click()
 		cy.fillInValueTextLine('title', 'first row')
 		cy.fillInValueSelection('selection', 'sel1')
 		cy.fillInValueSelectionMulti('multi selection', ['A', 'B'])
 		cy.fillInValueSelectionCheck('check')
-		cy.get('button').contains('Save').click()
+		cy.get('[data-cy="createRowSaveButton"]').click()
 
 		// add row
-		cy.get('button').contains('Create row').click()
+		cy.get('[data-cy="createRowBtn"]').click()
 		cy.fillInValueTextLine('title', 'second row')
 		cy.fillInValueSelection('selection', 'sel2')
 		cy.fillInValueSelectionMulti('multi selection', ['B'])
 		cy.fillInValueSelectionCheck('check')
-		cy.get('button').contains('Save').click()
+		cy.get('[data-cy="createRowSaveButton"]').click()
 
 		// add row
-		cy.get('button').contains('Create row').click()
+		cy.get('[data-cy="createRowBtn"]').click()
 		cy.fillInValueTextLine('title', 'third row')
 		cy.fillInValueSelection('selection', 'sel3')
 		cy.fillInValueSelectionMulti('multi selection', ['C', 'B', 'D'])
-		cy.get('button').contains('Save').click()
+		cy.get('[data-cy="createRowSaveButton"]').click()
 
 		// add row
-		cy.get('button').contains('Create row').click()
+		cy.get('[data-cy="createRowBtn"]').click()
 		cy.fillInValueTextLine('title', 'fourth row')
 		cy.fillInValueSelectionMulti('multi selection', ['A'])
 		cy.fillInValueSelectionCheck('check')
-		cy.get('button').contains('Save').click()
+		cy.get('[data-cy="createRowSaveButton"]').click()
 
 		// add row
-		cy.get('button').contains('Create row').click()
+		cy.get('[data-cy="createRowBtn"]').click()
 		cy.fillInValueTextLine('title', 'fifths row')
 		cy.fillInValueSelection('selection', 'sel4')
 		cy.fillInValueSelectionMulti('multi selection', ['D'])
 		cy.fillInValueSelectionCheck('check')
-		cy.get('button').contains('Save').click()
+		cy.get('[data-cy="createRowSaveButton"]').click()
 
 		// add row
-		cy.get('button').contains('Create row').click()
+		cy.get('[data-cy="createRowBtn"]').click()
 		cy.fillInValueTextLine('title', 'sixths row')
 		cy.fillInValueSelection('selection', 'sel1')
 		cy.fillInValueSelectionMulti('multi selection', ['C', 'D'])
 		cy.fillInValueSelectionCheck('check')
-		cy.get('button').contains('Save').click()
+		cy.get('[data-cy="createRowSaveButton"]').click()
 
 		// add row
-		cy.get('button').contains('Create row').click()
+		cy.get('[data-cy="createRowBtn"]').click()
 		cy.fillInValueTextLine('title', 'sevenths row')
 		cy.fillInValueSelection('selection', 'sel2')
 		cy.fillInValueSelectionMulti('multi selection', ['A', 'C', 'B', 'D'])
-		cy.get('button').contains('Save').click()
+		cy.get('[data-cy="createRowSaveButton"]').click()
 	})
 
 	it('Filter view for single selection', () => {
@@ -89,7 +89,7 @@ describe('Filtering in a view by selection columns', () => {
 		cy.get('.modal-container #settings-section_title input').type(title)
 
 		// ## add filter
-		cy.get('button').contains('Add new filter group').click()
+		cy.get('[data-cy="filterFormFilterGroupBtn"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(0).click()
 		cy.get('ul.vs__dropdown-menu li span[title="selection"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(1).click()
@@ -156,7 +156,7 @@ describe('Filtering in a view by selection columns', () => {
 		cy.get('.modal-container #settings-section_title input').type(title)
 
 		// ## add filter
-		cy.get('button').contains('Add new filter group').click()
+		cy.get('[data-cy="filterFormFilterGroupBtn"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(0).click()
 		cy.get('ul.vs__dropdown-menu li span[title="multi selection"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(1).click()
@@ -197,7 +197,7 @@ describe('Filtering in a view by selection columns', () => {
 		cy.get('.modal-container #settings-section_title input').type(title)
 
 		// ## add filter
-		cy.get('button').contains('Add new filter group').click()
+		cy.get('[data-cy="filterFormFilterGroupBtn"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(0).click()
 		cy.get('ul.vs__dropdown-menu li span[title="multi selection"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(1).click()
@@ -238,7 +238,7 @@ describe('Filtering in a view by selection columns', () => {
 		cy.get('.modal-container #settings-section_title input').type(title)
 
 		// ## add filter
-		cy.get('button').contains('Add new filter group').click()
+		cy.get('[data-cy="filterFormFilterGroupBtn"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(0).click()
 		cy.get('ul.vs__dropdown-menu li span[title="multi selection"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(1).click()
@@ -246,7 +246,7 @@ describe('Filtering in a view by selection columns', () => {
 		cy.get('.modal-container .filter-group .v-select.select').eq(2).click()
 		cy.get('ul.vs__dropdown-menu li span[title="A"]').click()
 
-		cy.get('button').contains('Add new filter').click()
+		cy.get('[data-cy="filterGroupAddFilterBtn"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(3).click()
 		cy.get('ul.vs__dropdown-menu li span[title="multi selection"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(4).click()
@@ -287,7 +287,7 @@ describe('Filtering in a view by selection columns', () => {
 		cy.get('.modal-container #settings-section_title input').type(title)
 
 		// ## add filter
-		cy.get('button').contains('Add new filter group').click()
+		cy.get('[data-cy="filterFormFilterGroupBtn"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(0).click()
 		cy.get('ul.vs__dropdown-menu li span[title="multi selection"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(1).click()
@@ -295,7 +295,7 @@ describe('Filtering in a view by selection columns', () => {
 		cy.get('.modal-container .filter-group .v-select.select').eq(2).click()
 		cy.get('ul.vs__dropdown-menu li span[title="A"]').click()
 
-		cy.get('button').contains('Add new filter').click()
+		cy.get('[data-cy="filterGroupAddFilterBtn"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(3).click()
 		cy.get('ul.vs__dropdown-menu li span[title="multi selection"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(4).click()
@@ -303,7 +303,7 @@ describe('Filtering in a view by selection columns', () => {
 		cy.get('.modal-container .filter-group .v-select.select').eq(5).click()
 		cy.get('ul.vs__dropdown-menu li span[title="B"]').click()
 
-		cy.get('button').contains('Add new filter group').click()
+		cy.get('[data-cy="filterFormFilterGroupBtn"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(6).click()
 		cy.get('ul.vs__dropdown-menu li span[title="multi selection"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(7).click()
@@ -344,7 +344,7 @@ describe('Filtering in a view by selection columns', () => {
 		cy.get('.modal-container #settings-section_title input').type(title)
 
 		// ## add filter
-		cy.get('button').contains('Add new filter group').click()
+		cy.get('[data-cy="filterFormFilterGroupBtn"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(0).click()
 		cy.get('ul.vs__dropdown-menu li span[title="check"]').click()
 		cy.get('.modal-container .filter-group .v-select.select').eq(1).click()
diff --git a/src/App.vue b/src/App.vue
index 7cf2ba5a9c..faece768d5 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -166,7 +166,7 @@ export default {
 	}
 
 </style>
-<style lang="scss">
+<style lang="scss" scoped>
 
 h1 {
 	font-size: 1.98em;
diff --git a/src/modules/main/partials/editViewPartials/filter/FilterGroup.vue b/src/modules/main/partials/editViewPartials/filter/FilterGroup.vue
index fe34964251..f118f40db8 100644
--- a/src/modules/main/partials/editViewPartials/filter/FilterGroup.vue
+++ b/src/modules/main/partials/editViewPartials/filter/FilterGroup.vue
@@ -19,6 +19,7 @@
 			:close-after-click="true"
 			type="tertiary"
 			:aria-label="t('tables', 'Add new filter')"
+			data-cy="filterGroupAddFilterBtn"
 			@click="addFilter">
 			{{ t('tables', 'Add new filter') }}
 			<template #icon>
diff --git a/src/modules/navigation/partials/NavigationTableItem.vue b/src/modules/navigation/partials/NavigationTableItem.vue
index b81bdc4077..2da245f2f6 100644
--- a/src/modules/navigation/partials/NavigationTableItem.vue
+++ b/src/modules/navigation/partials/NavigationTableItem.vue
@@ -307,7 +307,7 @@ export default {
 	},
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 
 .app-navigation-entry.active {
 	.icon-share  {
diff --git a/src/pages/Table.vue b/src/pages/Table.vue
index 83b09ee07b..4c0255cf77 100644
--- a/src/pages/Table.vue
+++ b/src/pages/Table.vue
@@ -41,7 +41,7 @@ export default {
 	},
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .main-table-view {
 	width: max-content;
 	min-width: var(--app-content-width, 100%);
diff --git a/src/pages/View.vue b/src/pages/View.vue
index 0e2654a4fd..844be25c74 100644
--- a/src/pages/View.vue
+++ b/src/pages/View.vue
@@ -36,7 +36,7 @@ export default {
 	},
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
 .main-view-view {
 	width: max-content;
 	min-width: var(--app-content-width, 100%);
diff --git a/src/shared/components/ncTable/NcTable.vue b/src/shared/components/ncTable/NcTable.vue
index eef250ae02..6c50b078c0 100644
--- a/src/shared/components/ncTable/NcTable.vue
+++ b/src/shared/components/ncTable/NcTable.vue
@@ -278,7 +278,7 @@ export default {
 }
 </style>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .image_container.widget-file {
 	height: auto !important;
 }
diff --git a/src/shared/components/ncTable/partials/TiptapMenuBar.vue b/src/shared/components/ncTable/partials/TiptapMenuBar.vue
index e514bc491a..d63da17750 100644
--- a/src/shared/components/ncTable/partials/TiptapMenuBar.vue
+++ b/src/shared/components/ncTable/partials/TiptapMenuBar.vue
@@ -201,7 +201,7 @@ export default {
 }
 </script>
 
-<style lang="scss">
+<style lang="scss" scoped>
 
 .character-count {
 	display: flex;
diff --git a/src/styles/smart-picker.scss b/src/styles/smart-picker.scss
index e8f67464f7..a57b167c36 100644
--- a/src/styles/smart-picker.scss
+++ b/src/styles/smart-picker.scss
@@ -3,75 +3,75 @@
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
 
-.picker-content {
+.tables-smart-picker {
 	width: 100%;
 	min-height: 350px;
 	display: flex;
 	flex-direction: column;
 	overflow-y: auto;
 	padding: 0 16px 16px 16px;
-}
 
-.picker-content > h2 {
-	margin: 12px 0;
-	text-align: center;
-}
+	> h2 {
+		margin: 12px 0;
+		text-align: center;
+	}
 
-h3 {
-	margin: 0;
-}
+	h3 {
+		margin: 0;
+	}
 
-.space-B {
-	margin-bottom: calc(var(--default-grid-baseline) * 4);
-}
+	.space-B {
+		margin-bottom: calc(var(--default-grid-baseline) * 4);
+	}
 
-.space-T {
-	margin-top: calc(var(--default-grid-baseline) * 2);
-}
+	.space-T {
+		margin-top: calc(var(--default-grid-baseline) * 2);
+	}
 
-table {
-	width: 100%;
-}
+	table {
+		width: 100%;
 
-table th, table td {
-	border: none !important;
-	width: 50%;
-	padding-left: calc(var(--default-grid-baseline) * 2);
-	padding-right: calc(var(--default-grid-baseline) * 2);
-}
+		th, td {
+			border: none !important;
+			width: 50%;
+			padding-left: calc(var(--default-grid-baseline) * 2);
+			padding-right: calc(var(--default-grid-baseline) * 2);
+		}
+	}
 
-.radio {
-	display: flex;
-}
+	.radio {
+		display: flex;
 
-.radio > span {
-	padding-right: calc(var(--default-grid-baseline) * 6);
-}
+		> span {
+			padding-right: calc(var(--default-grid-baseline) * 6);
+		}
 
-.radio label .material-design-icon {
-	padding-right: calc(var(--default-grid-baseline) * 1);
-}
+		label .material-design-icon {
+			padding-right: calc(var(--default-grid-baseline) * 1);
+		}
+	}
 
-.select-button {
-	bottom: 0;
-	width: 100%;
-	display: flex;
-	align-items: end;
-	flex-direction: column;
-	position:sticky;
-}
+	.select-button {
+		bottom: 0;
+		width: 100%;
+		display: flex;
+		align-items: end;
+		flex-direction: column;
+		position: sticky;
+	}
 
-.selection-wrapper {
-	width: 100%;
-}
+	.selection-wrapper {
+		width: 100%;
 
-.selection-wrapper .selection {
-	margin-left: auto;
-	margin-right: auto;
-	width: 550px;
-}
+		.selection {
+			margin-left: auto;
+			margin-right: auto;
+			width: 550px;
+		}
+	}
 
-.preview {
-	border: 2px solid var(--color-border);
-	border-radius: var(--border-radius-large);
+	.preview {
+		border: 2px solid var(--color-border);
+		border-radius: var(--border-radius-large);
+	}
 }
\ No newline at end of file
diff --git a/src/views/SmartPicker.vue b/src/views/SmartPicker.vue
index 5614fb5a90..d802e53e5e 100644
--- a/src/views/SmartPicker.vue
+++ b/src/views/SmartPicker.vue
@@ -3,8 +3,8 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<div class="tables-smart-picker picker-content">
-		<h2 class="picker-title">
+	<div class="tables-smart-picker">
+		<h2>
 			{{ t('tables', 'Nextcloud Tables') }}
 		</h2>
 		<div class="selection-wrapper">