diff --git a/AppController.h b/AppController.h
index 3ee603e..47ba8e4 100755
--- a/AppController.h
+++ b/AppController.h
@@ -17,7 +17,7 @@
 
 @class SGHotKey;
 
-@interface AppController : NSObject <DBSyncPromptDelegate> {
+@interface AppController : NSObject {
     BezelWindow					*bezel;
 	SGHotKey					*mainHotKey;
 	IBOutlet SRRecorderControl	*mainRecorder;
diff --git a/AppController.m b/AppController.m
index b02f5ee..1f528b3 100755
--- a/AppController.m
+++ b/AppController.m
@@ -49,7 +49,10 @@
         [NSNumber numberWithFloat:320.0],
         @"bezelHeight",
         [NSDictionary dictionary],
-        @"store", nil]];
+        @"store",
+        [NSNumber numberWithBool:YES],
+        @"skipPasswordFields",
+        nil]];
 	return [super init];
 }
 
@@ -121,6 +124,13 @@
 	// Stack position starts @ 0 by default
 	stackPosition = 0;
 
+    [[NSNotificationCenter defaultCenter] addObserverForName:@"DBSyncPromptUserDidCancelNotification" 
+     object:nil queue:nil usingBlock:^(NSNotification *notification) {
+                  [self setDropboxSync:NO];
+
+         //[[DBUserDefaults standardUserDefaults] setDropboxSyncEnabled:NO];
+
+     }];
 	[NSApp activateIgnoringOtherApps: YES];
 }
 
@@ -283,8 +293,8 @@
         pbCount = [[NSNumber numberWithInt:[jcPasteboard changeCount]] retain];
         if ( type != nil ) {
 			NSString *contents = [jcPasteboard stringForType:type];
-			if ( contents == nil ) {
-//                NSLog(@"Contents: Empty");
+			if ( contents == nil || ([jcPasteboard stringForType:@"PasswordPboardType"] && [[DBUserDefaults standardUserDefaults] boolForKey:@"skipPasswordFields"]) ) {
+                NSLog(@"Contents: Empty");
             } else {
 				if (( [clippingStore jcListCount] == 0 || ! [contents isEqualToString:[clippingStore clippingContentsAtPosition:0]])
 					&&  ! [pbCount isEqualTo:pbBlockCount] ) {
@@ -652,6 +662,7 @@
 }
 
 - (IBAction)toggleDropboxSync:(NSButtonCell*)sender {
+
     DBUserDefaults * defaults = [DBUserDefaults standardUserDefaults];
     // First, let's check to make sure Dropbox is available on this machine
     if (sender.state == 1) { 
@@ -694,16 +705,10 @@
         if([DBUserDefaults isDropboxAvailable])
             [defaults promptDropboxUnavailable];        
         else [[DBUserDefaults standardUserDefaults] setDropboxSyncEnabled:YES];
-    } else [[DBUserDefaults standardUserDefaults] setDropboxSyncEnabled:NO];
-}
-
-- (void)syncPromptDidSelectOption:(DBSyncPromptOption)option {                                                              
-    //TODO
-}
-
-- (void)syncPromptDidCancel {
-    [dropboxCheckbox setState:0];
-    [self setDropboxSync:NO];
+    } else {
+        [[DBUserDefaults standardUserDefaults] setDropboxSyncEnabled:NO];
+        [dropboxCheckbox setState:NSOffState];   
+    }
 }
 
 - (void) dealloc {
diff --git a/DBUserDefaults.framework/Versions/A/DBUserDefaults b/DBUserDefaults.framework/Versions/A/DBUserDefaults
index 61b468e..074c9ff 100755
Binary files a/DBUserDefaults.framework/Versions/A/DBUserDefaults and b/DBUserDefaults.framework/Versions/A/DBUserDefaults differ
diff --git a/DBUserDefaults.framework/Versions/A/Resources/DBSyncPrompt.nib b/DBUserDefaults.framework/Versions/A/Resources/DBSyncPrompt.nib
index d53f640..5bbed4b 100644
Binary files a/DBUserDefaults.framework/Versions/A/Resources/DBSyncPrompt.nib and b/DBUserDefaults.framework/Versions/A/Resources/DBSyncPrompt.nib differ
diff --git a/English.lproj/MainMenu.nib/designable.nib b/English.lproj/MainMenu.nib/designable.nib
index e59e0ef..ab7afcd 100644
--- a/English.lproj/MainMenu.nib/designable.nib
+++ b/English.lproj/MainMenu.nib/designable.nib
@@ -185,7 +185,7 @@
 															<object class="NSButton" id="38658042">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{14, 212}, {97, 18}}</string>
+																<string key="NSFrame">{{14, 254}, {97, 18}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="369594545"/>
@@ -218,7 +218,7 @@
 															<object class="NSPopUpButton" id="620054236">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{79, 70}, {189, 26}}</string>
+																<string key="NSFrame">{{79, 112}, {189, 26}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="57469449"/>
@@ -295,7 +295,7 @@
 															<object class="NSButton" id="110220131">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{14, 151}, {204, 18}}</string>
+																<string key="NSFrame">{{14, 193}, {204, 18}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="41950895"/>
@@ -319,7 +319,7 @@
 															<object class="NSButton" id="41950895">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{14, 131}, {247, 18}}</string>
+																<string key="NSFrame">{{14, 173}, {247, 18}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="15249688"/>
@@ -340,10 +340,34 @@
 																	<int key="NSPeriodicInterval">25</int>
 																</object>
 															</object>
+															<object class="NSButton" id="11788839">
+																<reference key="NSNextResponder" ref="779479303"/>
+																<int key="NSvFlags">256</int>
+																<string key="NSFrame">{{14, 56}, {247, 18}}</string>
+																<reference key="NSSuperview" ref="779479303"/>
+																<reference key="NSWindow"/>
+																<reference key="NSNextKeyView"/>
+																<bool key="NSEnabled">YES</bool>
+																<object class="NSButtonCell" key="NSCell" id="708882769">
+																	<int key="NSCellFlags">67239424</int>
+																	<int key="NSCellFlags2">0</int>
+																	<string key="NSContents">Don't copy from password fields</string>
+																	<reference key="NSSupport" ref="274724818"/>
+																	<reference key="NSControlView" ref="11788839"/>
+																	<int key="NSButtonFlags">1211912703</int>
+																	<int key="NSButtonFlags2">2</int>
+																	<reference key="NSNormalImage" ref="639241089"/>
+																	<reference key="NSAlternateImage" ref="469882834"/>
+																	<string key="NSAlternateContents"/>
+																	<string key="NSKeyEquivalent"/>
+																	<int key="NSPeriodicDelay">200</int>
+																	<int key="NSPeriodicInterval">25</int>
+																</object>
+															</object>
 															<object class="NSTextField" id="15249688">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{13, 98}, {76, 23}}</string>
+																<string key="NSFrame">{{13, 140}, {76, 23}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="1001912577"/>
@@ -377,7 +401,7 @@
 															<object class="NSTextField" id="1001912577">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{13, 76}, {33, 14}}</string>
+																<string key="NSFrame">{{13, 118}, {33, 14}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="620054236"/>
@@ -399,7 +423,7 @@
 															<object class="NSTextField" id="57469449">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{13, 50}, {62, 14}}</string>
+																<string key="NSFrame">{{13, 92}, {62, 14}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="224411678"/>
@@ -417,7 +441,7 @@
 															<object class="NSTextField" id="583370041">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{134, 50}, {95, 14}}</string>
+																<string key="NSFrame">{{134, 92}, {95, 14}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="1003413245"/>
@@ -435,7 +459,7 @@
 															<object class="NSTextField" id="224411678">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{79, 45}, {25, 22}}</string>
+																<string key="NSFrame">{{79, 87}, {25, 22}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="953619213"/>
@@ -526,7 +550,7 @@
 															<object class="NSTextField" id="1003413245">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{224, 45}, {24, 22}}</string>
+																<string key="NSFrame">{{224, 87}, {24, 22}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="133997452"/>
@@ -594,7 +618,7 @@
 															<object class="NSStepper" id="953619213">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{104, 43}, {19, 27}}</string>
+																<string key="NSFrame">{{104, 85}, {19, 27}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="583370041"/>
@@ -614,10 +638,10 @@
 															<object class="NSStepper" id="133997452">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{249, 43}, {19, 27}}</string>
+																<string key="NSFrame">{{249, 85}, {19, 27}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
-																<reference key="NSNextKeyView"/>
+																<reference key="NSNextKeyView" ref="11788839"/>
 																<bool key="NSEnabled">YES</bool>
 																<object class="NSStepperCell" key="NSCell" id="603252108">
 																	<int key="NSCellFlags">917024</int>
@@ -634,7 +658,7 @@
 															<object class="NSButton" id="369594545">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{14, 192}, {162, 18}}</string>
+																<string key="NSFrame">{{14, 234}, {162, 18}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="992252027"/>
@@ -657,7 +681,7 @@
 															<object class="NSButton" id="992252027">
 																<reference key="NSNextResponder" ref="779479303"/>
 																<int key="NSvFlags">256</int>
-																<string key="NSFrame">{{14, 172}, {162, 18}}</string>
+																<string key="NSFrame">{{14, 214}, {162, 18}}</string>
 																<reference key="NSSuperview" ref="779479303"/>
 																<reference key="NSWindow"/>
 																<reference key="NSNextKeyView" ref="110220131"/>
@@ -678,13 +702,13 @@
 																</object>
 															</object>
 														</object>
-														<string key="NSFrameSize">{555, 242}</string>
+														<string key="NSFrameSize">{555, 284}</string>
 														<reference key="NSSuperview" ref="220648752"/>
 														<reference key="NSWindow"/>
 														<reference key="NSNextKeyView" ref="38658042"/>
 													</object>
 												</object>
-												<string key="NSFrame">{{-3, 243}, {555, 242}}</string>
+												<string key="NSFrame">{{-3, 201}, {555, 284}}</string>
 												<reference key="NSSuperview" ref="584038330"/>
 												<reference key="NSWindow"/>
 												<reference key="NSNextKeyView" ref="779479303"/>
@@ -1216,7 +1240,7 @@
 																			<object class="NSTextView" id="1060798950">
 																				<reference key="NSNextResponder" ref="765116797"/>
 																				<int key="NSvFlags">2322</int>
-																				<string key="NSFrameSize">{398, 336}</string>
+																				<string key="NSFrameSize">{398, 406}</string>
 																				<reference key="NSSuperview" ref="765116797"/>
 																				<reference key="NSNextKeyView"/>
 																				<object class="NSTextContainer" key="NSTextContainer" id="564979213">
@@ -1391,6 +1415,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 																		<string key="NSFrame">{{-100, -100}, {15, 170}}</string>
 																		<reference key="NSSuperview" ref="991469956"/>
 																		<reference key="NSNextKeyView" ref="87711434"/>
+																		<bool key="NSEnabled">YES</bool>
 																		<reference key="NSTarget" ref="991469956"/>
 																		<string key="NSAction">_doScroller:</string>
 																		<double key="NSCurValue">0.4805194805194804</double>
@@ -1412,7 +1437,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 																<string key="NSFrame">{{16, 16}, {476, 346}}</string>
 																<reference key="NSSuperview" ref="635309791"/>
 																<reference key="NSNextKeyView" ref="121052580"/>
-																<int key="NSsFlags">2</int>
+																<int key="NSsFlags">66</int>
 																<reference key="NSVScroller" ref="121052580"/>
 																<reference key="NSHScroller" ref="87711434"/>
 																<reference key="NSContentView" ref="765116797"/>
@@ -1885,6 +1910,22 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 					</object>
 					<int key="connectionID">896</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBBindingConnection" key="connection">
+						<string key="label">value: values.skipPasswordFields</string>
+						<reference key="source" ref="11788839"/>
+						<reference key="destination" ref="58044156"/>
+						<object class="NSNibBindingConnector" key="connector">
+							<reference key="NSSource" ref="11788839"/>
+							<reference key="NSDestination" ref="58044156"/>
+							<string key="NSLabel">value: values.skipPasswordFields</string>
+							<string key="NSBinding">value</string>
+							<string key="NSKeyPath">values.skipPasswordFields</string>
+							<int key="NSNibBindingConnectorVersion">2</int>
+						</object>
+					</object>
+					<int key="connectionID">902</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -2058,6 +2099,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 							<reference ref="1003413245"/>
 							<reference ref="953619213"/>
 							<reference ref="133997452"/>
+							<reference ref="11788839"/>
 						</object>
 						<reference key="parent" ref="584038330"/>
 					</object>
@@ -2100,6 +2142,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 							<reference ref="911421446"/>
 						</object>
 						<reference key="parent" ref="485005275"/>
+						<string key="objectName">Box - Box</string>
 					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">264</int>
@@ -2677,6 +2720,20 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 						<reference key="object" ref="44911830"/>
 						<reference key="parent" ref="887962621"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">897</int>
+						<reference key="object" ref="11788839"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="708882769"/>
+						</object>
+						<reference key="parent" ref="220648752"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">898</int>
+						<reference key="object" ref="708882769"/>
+						<reference key="parent" ref="11788839"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2796,6 +2853,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 					<string>808.IBPluginDependency</string>
 					<string>857.IBPluginDependency</string>
 					<string>858.IBPluginDependency</string>
+					<string>897.IBPluginDependency</string>
+					<string>898.IBPluginDependency</string>
 				</object>
 				<object class="NSMutableArray" key="dict.values">
 					<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2947,6 +3006,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -2961,7 +3022,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">896</int>
+			<int key="maxID">902</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib
index d45ac8e..74dd231 100644
Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and b/English.lproj/MainMenu.nib/keyedobjects.nib differ
diff --git a/JumpcutEngine/JumpcutClipping.m b/JumpcutEngine/JumpcutClipping.m
index faa81a7..ea2ef43 100755
--- a/JumpcutEngine/JumpcutClipping.m
+++ b/JumpcutEngine/JumpcutClipping.m
@@ -121,18 +121,19 @@
 
 -(void) resetDisplayString
 {
-    NSString *newDisplayString, *firstLineOfClipping;
+    NSString *newDisplayString, *firstLineOfClipping, *trimmedString;
 	NSUInteger start, lineEnd, contentsEnd;
 	NSRange startRange = NSMakeRange(0,0);
 	NSRange contentsRange;
 	// We're resetting the display string, so release the old one.
     [clipDisplayString release];
 	// We want to restrict the display string to the clipping contents through the first line break.
-	[clipContents getLineStart:&start end:&lineEnd contentsEnd:&contentsEnd forRange:startRange];
+    trimmedString = [clipContents stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]];
+    [trimmedString getLineStart:&start end:&lineEnd contentsEnd:&contentsEnd forRange:startRange];
 	contentsRange = NSMakeRange(0, contentsEnd);
-	firstLineOfClipping = [clipContents substringWithRange:contentsRange];
+	firstLineOfClipping = [trimmedString substringWithRange:contentsRange];
     if ( [firstLineOfClipping length] > clipDisplayLength ) {
-        newDisplayString = [[NSString stringWithString:[firstLineOfClipping substringToIndex:clipDisplayLength]] stringByAppendingString:@"..."];   
+        newDisplayString = [[NSString stringWithString:[firstLineOfClipping substringToIndex:clipDisplayLength]] stringByAppendingString:@"…"];   
     } else {
         newDisplayString = [NSString stringWithString:firstLineOfClipping];
     }