diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 236a5e21..1f5d8a31 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -1123,6 +1123,16 @@
 			name = Inspector;
 			sourceTree = "<group>";
 		};
+		4C5133861FA0C32C00C94C73 /* Accessory */ = {
+			isa = PBXGroup;
+			children = (
+				4C0F647917B6BC9C00D9522A /* MPSavePanelAccessoryViewController.h */,
+				4C0F647A17B6BC9C00D9522A /* MPSavePanelAccessoryViewController.m */,
+				4C0728BE17B68ED0005A7DD9 /* SavePanelAccessoryView.xib */,
+			);
+			name = Accessory;
+			sourceTree = "<group>";
+		};
 		4C586F9C16D07ABD00E7DB57 /* Database Icons */ = {
 			isa = PBXGroup;
 			children = (
@@ -1358,6 +1368,7 @@
 		4CA0B2F115BCAEE600654E32 /* View Controller */ = {
 			isa = PBXGroup;
 			children = (
+				4C5133861FA0C32C00C94C73 /* Accessory */,
 				4C47D77718B37911002755E4 /* Settings */,
 				4C4B7EF517A46815000234C7 /* Inspector */,
 				4C2E382416D1470200037A9D /* MPViewController.h */,
@@ -1380,9 +1391,6 @@
 				4C4B7EE617A45EC5000234C7 /* MPDatePickingViewController.h */,
 				4C4B7EE717A45EC5000234C7 /* MPDatePickingViewController.m */,
 				6021FE7918E15FF300C3BC51 /* DatePickingView.xib */,
-				4C0F647917B6BC9C00D9522A /* MPSavePanelAccessoryViewController.h */,
-				4C0F647A17B6BC9C00D9522A /* MPSavePanelAccessoryViewController.m */,
-				4C0728BE17B68ED0005A7DD9 /* SavePanelAccessoryView.xib */,
 				4C1E9883185F71A800943563 /* MPContextBarViewController.h */,
 				4C1E9884185F71A800943563 /* MPContextBarViewController.m */,
 				4C3FFD9D16DAF60600DF9186 /* ContextBar.xib */,
diff --git a/MacPass/MPReferenceBuilderViewController.m b/MacPass/MPReferenceBuilderViewController.m
index 0af268b7..95b6ec85 100644
--- a/MacPass/MPReferenceBuilderViewController.m
+++ b/MacPass/MPReferenceBuilderViewController.m
@@ -46,14 +46,14 @@
 - (NSMenu *)_allocateAttributeItemMenu:(BOOL)allowCustomAttributes withTitle:(NSString *)title {
   NSMenu *menu = [[NSMenu alloc] init];
   /* first item is button label */
-  [menu addItemWithTitle:NSLocalizedString(@"UUID","") action:NULL keyEquivalent:@""];
-  [menu addItemWithTitle:NSLocalizedString(@"TITLE","") action:NULL keyEquivalent:@""];
-  [menu addItemWithTitle:NSLocalizedString(@"USERNAME","") action:NULL keyEquivalent:@""];
-  [menu addItemWithTitle:NSLocalizedString(@"PASSWORD","") action:NULL keyEquivalent:@""];
-  [menu addItemWithTitle:NSLocalizedString(@"URL","") action:NULL keyEquivalent:@""];
-  [menu addItemWithTitle:NSLocalizedString(@"NOTES","") action:NULL keyEquivalent:@""];
+  [menu addItemWithTitle:NSLocalizedString(@"UUID","UUID reference item") action:NULL keyEquivalent:@""];
+  [menu addItemWithTitle:NSLocalizedString(@"TITLE","Title reference item") action:NULL keyEquivalent:@""];
+  [menu addItemWithTitle:NSLocalizedString(@"USERNAME","Username reference item") action:NULL keyEquivalent:@""];
+  [menu addItemWithTitle:NSLocalizedString(@"PASSWORD","Password reference item") action:NULL keyEquivalent:@""];
+  [menu addItemWithTitle:NSLocalizedString(@"URL","URL reference item") action:NULL keyEquivalent:@""];
+  [menu addItemWithTitle:NSLocalizedString(@"NOTES","Notes reference item") action:NULL keyEquivalent:@""];
   if(allowCustomAttributes) {
-    [menu addItemWithTitle:NSLocalizedString(@"CUSTOM_ATTRIBUTE","") action:NULL keyEquivalent:@""];
+    [menu addItemWithTitle:NSLocalizedString(@"CUSTOM_ATTRIBUTE","Curstom attribute reference item") action:NULL keyEquivalent:@""];
   }
   NSArray *keys = @[ kKPKReferenceUUIDKey, kKPKReferenceTitleKey, kKPKReferenceUsernameKey, kKPKReferencePasswordKey, kKPKReferenceURLKey, kKPKReferenceNotesKey, @"S" ];
   [menu.itemArray enumerateObjectsUsingBlock:^(id obj, NSUInteger idx, BOOL *stop) {