diff --git a/app/app/components/document/document-toolbar.js b/app/app/components/document/document-toolbar.js
index 25378ab1..5db06255 100644
--- a/app/app/components/document/document-toolbar.js
+++ b/app/app/components/document/document-toolbar.js
@@ -118,6 +118,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 		},
 
 		unpin() {
+			this.audit.record('unpinned-document');
+
 			this.get('pinned').unpinItem(this.get('pinState.pinId')).then(() => {
 				this.set('pinState.isPinned', false);
 				this.set('pinState.pinId', '');
@@ -137,6 +139,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 				return false;
 			}
 
+			this.audit.record('pinned-document');
+
 			this.get('pinned').pinItem(pin).then((pin) => {
 				this.set('pinState.isPinned', true);
 				this.set('pinState.pinId', pin.get('id'));
diff --git a/app/app/components/folder/folder-toolbar.js b/app/app/components/folder/folder-toolbar.js
index fb9a2966..17ca37f5 100644
--- a/app/app/components/folder/folder-toolbar.js
+++ b/app/app/components/folder/folder-toolbar.js
@@ -100,6 +100,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 		},
 
 		unpin() {
+			this.audit.record('unpinned-space');
+
 			this.get('pinned').unpinItem(this.get('pinState.pinId')).then(() => {
 				this.set('pinState.isPinned', false);
 				this.set('pinState.pinId', '');
@@ -119,6 +121,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 				return false;
 			}
 
+			this.audit.record('pinned-space');
+
 			this.get('pinned').pinItem(pin).then((pin) => {
 				this.set('pinState.isPinned', true);
 				this.set('pinState.pinId', pin.get('id'));
@@ -126,6 +130,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
 			});
 
 			return true;
-		}		
+		}
 	}
 });
diff --git a/app/app/components/layout/zone-navigation.js b/app/app/components/layout/zone-navigation.js
index cc369299..460bc55d 100644
--- a/app/app/components/layout/zone-navigation.js
+++ b/app/app/components/layout/zone-navigation.js
@@ -72,6 +72,8 @@ export default Ember.Component.extend(TooltipMixin, {
 			var sortable = Sortable.create(document.getElementById('pinned-zone'), {
 				animation: 150,
 				onEnd: function () {
+					self.audit.record('reorganized-pins');
+
 					self.get('pinned').updateSequence(this.toArray()).then((pins) => {
 						self.set('pins', pins);
 					});
@@ -94,7 +96,15 @@ export default Ember.Component.extend(TooltipMixin, {
 	},
 
 	setupPins() {
+		if (this.get('isDestroyed') || this.get('isDestroying')) {
+			return;
+		}
+
 		this.get('pinned').getUserPins().then((pins) => {
+			if (this.get('isDestroyed') || this.get('isDestroying')) {
+				return;
+			}
+
 			this.set('pins', pins);
 
 			pins.forEach((pin) => {
diff --git a/app/app/styles/view/layout.scss b/app/app/styles/view/layout.scss
index 533c0887..d8c0891d 100644
--- a/app/app/styles/view/layout.scss
+++ b/app/app/styles/view/layout.scss
@@ -115,7 +115,6 @@
 			width: 40px;
 			text-align: center;
 			overflow: hidden;
-			text-transform: uppercase;
 			@include ease-in();
 			@include border-radius(3px);
 			font-family: $font-semibold;