diff --git a/client/src/components/NoteTitleDisplayCard.vue b/client/src/components/NoteTitleDisplayCard.vue
index e0fba46..322dc5d 100644
--- a/client/src/components/NoteTitleDisplayCard.vue
+++ b/client/src/components/NoteTitleDisplayCard.vue
@@ -61,7 +61,6 @@
 				
 			<!-- Toolbar on the bottom  -->
 			<div class="tool-bar" @click.self="cardClicked">
-
 				<div class="icon-bar">
 					<!-- {{$helpers.timeAgo(note.updated)}}  -->
 					
@@ -79,10 +78,14 @@
 					<!-- :class="{ 'hover-hide':(!$store.getters.getIsUserOnMobile) }" -->
 					<span class="float-right" :class="{ 'hover-hide':(!$store.getters.getIsUserOnMobile) }">
 
-<!-- 						<span class="teeny-button" data-tooltip="Archive" data-inverted>
+						<!-- 						<span class="teeny-button" data-tooltip="Archive" data-inverted>
 							<i class="archive icon"></i>
 						</span> -->
 
+						<i class="teeny-button" data-tooltip="Tags" data-inverted v-on:click="toggleTags(true)">
+							<i class="tags icon"></i>
+						</i>
+
 						<i class="teeny-button" data-tooltip="Pin" data-inverted v-on:click="pinNote">
 							<i class="pin icon"></i>
 						</i>
@@ -90,9 +93,6 @@
 						<delete-button class="teeny-button"  :note-id="note.id" />
 
 					</span>
-
-					
-
 				</div>
 
 				<div v-if="getThumbs.length > 0">
@@ -103,9 +103,18 @@
 
 
 			</div>
+			<side-slide-menu v-if="showTagSlideMenu" v-on:close="toggleTags(false)">
+				<div class="ui basic segment">
+					<note-tag-edit :noteId="note.id" :key="'display-tags-for-note-'+note.id"/>
+				</div>
+			</side-slide-menu>
+
 		</div>
 
-	</div>
+
+
+		
+
 </template>
 
 <script>
@@ -117,6 +126,8 @@
 		props: [ 'onClick', 'data', 'currentlyOpen', 'textResults', 'attachmentResults', 'tagResults' ],
 		components: {
 			'delete-button': require('@/components/NoteDeleteButtonComponent.vue').default,
+			'note-tag-edit': require('@/components/NoteTagEdit.vue').default,
+			'side-slide-menu': require('@/components/SideSlideMenuComponent.vue').default,
 		},
 		methods:{
 			cardClicked(){
@@ -149,6 +160,14 @@
 				.then(data => {
 					this.$bus.$emit('update_single_note', this.note.id)
 				})
+			},
+			toggleTags(state){
+
+				this.showTagSlideMenu = state
+
+				if(state == false){
+					this.$bus.$emit('update_single_note', this.note.id)
+				}
 				
 			},
 		},
@@ -160,6 +179,7 @@
 				noteIcon: null,
 				iconColor: null,
 				beenClicked: false,
+				showTagSlideMenu: false,
 			}
 		},
 		computed: {
diff --git a/client/src/pages/NotesPage.vue b/client/src/pages/NotesPage.vue
index cfea9f0..debe9b3 100644
--- a/client/src/pages/NotesPage.vue
+++ b/client/src/pages/NotesPage.vue
@@ -213,6 +213,7 @@
 
 			this.$bus.$on('note_deleted', (noteId) => {
 				//Remove deleted note from set, its deleted
+				this.fetchUserTags()
 				Object.keys(this.noteSections).forEach( key => {
 					this.noteSections[key].forEach( (note, index) => {
 						if(note.id == noteId){