diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index c49f9192..4b868f15 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -73,6 +73,7 @@
 		4C5A11FE1708DE8700223D8A /* MPPasswordCreatorViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5A11FC1708DE8700223D8A /* MPPasswordCreatorViewController.m */; };
 		4C5A11FF1708DE8800223D8A /* PasswordCreatorView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C5A11FD1708DE8700223D8A /* PasswordCreatorView.xib */; };
 		4C5BF67B175C01F300D53DF7 /* MPUppercaseStringValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5BF67A175C01F300D53DF7 /* MPUppercaseStringValueTransformer.m */; };
+		4C5EC302177B700D00DA955B /* MPRootAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5EC301177B700D00DA955B /* MPRootAdapter.m */; };
 		4C61EA0316D2FD0800AC519E /* MPOutlineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C61EA0216D2FD0800AC519E /* MPOutlineViewController.m */; };
 		4C61EA0516D2FFE200AC519E /* OutlineView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C61EA0416D2FFE200AC519E /* OutlineView.xib */; };
 		4C65C79C16DD283900E32CFF /* MPToolbarButton.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C65C79B16DD283900E32CFF /* MPToolbarButton.m */; };
@@ -303,6 +304,8 @@
 		4C5A11FD1708DE8700223D8A /* PasswordCreatorView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordCreatorView.xib; sourceTree = "<group>"; };
 		4C5BF679175C01F300D53DF7 /* MPUppercaseStringValueTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPUppercaseStringValueTransformer.h; sourceTree = "<group>"; };
 		4C5BF67A175C01F300D53DF7 /* MPUppercaseStringValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPUppercaseStringValueTransformer.m; sourceTree = "<group>"; };
+		4C5EC300177B700D00DA955B /* MPRootAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPRootAdapter.h; sourceTree = "<group>"; };
+		4C5EC301177B700D00DA955B /* MPRootAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPRootAdapter.m; sourceTree = "<group>"; };
 		4C61EA0116D2FD0800AC519E /* MPOutlineViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineViewController.h; sourceTree = "<group>"; };
 		4C61EA0216D2FD0800AC519E /* MPOutlineViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineViewController.m; sourceTree = "<group>"; };
 		4C61EA0416D2FFE200AC519E /* OutlineView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OutlineView.xib; sourceTree = "<group>"; };
@@ -784,6 +787,8 @@
 				6E719715172058BA00E4C5FC /* MPDatabaseVersion.h */,
 				4CE5B548173AFBA700207B39 /* MPDocument.h */,
 				4CE5B549173AFBA700207B39 /* MPDocument.m */,
+				4C5EC300177B700D00DA955B /* MPRootAdapter.h */,
+				4C5EC301177B700D00DA955B /* MPRootAdapter.m */,
 			);
 			name = Model;
 			sourceTree = "<group>";
@@ -1426,6 +1431,7 @@
 				4C2724DA17790E7C00FD8456 /* NSMutableData+Base64.m in Sources */,
 				4C2A6134177A1D5F00C9826C /* KPLErrorCodes.m in Sources */,
 				4CD5D705177A5F3300100649 /* MPDocumentSettingsWindowController.m in Sources */,
+				4C5EC302177B700D00DA955B /* MPRootAdapter.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
diff --git a/MacPass/Base.lproj/GeneralSettings.xib b/MacPass/Base.lproj/GeneralSettings.xib
index cbcca2ea..df3c63c2 100644
--- a/MacPass/Base.lproj/GeneralSettings.xib
+++ b/MacPass/Base.lproj/GeneralSettings.xib
@@ -1220,11 +1220,6 @@
 						<reference key="object" ref="943587685"/>
 						<reference key="parent" ref="222890410"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">537</int>
-						<reference key="object" ref="19198291"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">630</int>
 						<reference key="object" ref="1066302408"/>
@@ -1253,11 +1248,6 @@
 						<reference key="object" ref="476689522"/>
 						<reference key="parent" ref="60918609"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">721</int>
-						<reference key="object" ref="528706521"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">759</int>
 						<reference key="object" ref="376978074"/>
@@ -1268,11 +1258,6 @@
 						<reference key="object" ref="871797750"/>
 						<reference key="parent" ref="326334884"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">788</int>
-						<reference key="object" ref="772519144"/>
-						<reference key="parent" ref="60918609"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">784</int>
 						<reference key="object" ref="1014678196"/>
@@ -1298,16 +1283,6 @@
 						<reference key="object" ref="1063893674"/>
 						<reference key="parent" ref="1005"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">799</int>
-						<reference key="object" ref="250630005"/>
-						<reference key="parent" ref="1005"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">800</int>
-						<reference key="object" ref="213536579"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">801</int>
 						<reference key="object" ref="806133159"/>
@@ -1351,6 +1326,31 @@
 						<reference key="object" ref="287888619"/>
 						<reference key="parent" ref="60918609"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">537</int>
+						<reference key="object" ref="19198291"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">721</int>
+						<reference key="object" ref="528706521"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">800</int>
+						<reference key="object" ref="213536579"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">799</int>
+						<reference key="object" ref="250630005"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">788</int>
+						<reference key="object" ref="772519144"/>
+						<reference key="parent" ref="60918609"/>
+					</object>
 				</array>
 			</object>
 			<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1471,18 +1471,17 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">810</int>
+			<int key="maxID">814</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
 					<string key="className">MPGeneralSettingsController</string>
-					<string key="superclassName">NSViewController</string>
+					<string key="superclassName">MPViewController</string>
 					<dictionary class="NSMutableDictionary" key="outlets">
 						<string key="clearPasteboardOnQuitCheckButton">NSButton</string>
 						<string key="clearPasteboardTimeoutPopup">NSPopUpButton</string>
 						<string key="idleTimeOutPopup">NSPopUpButton</string>
-						<string key="imageView">NSImageView</string>
 						<string key="lockOnSleepCheckButton">NSButton</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -1498,10 +1497,6 @@
 							<string key="name">idleTimeOutPopup</string>
 							<string key="candidateClassName">NSPopUpButton</string>
 						</object>
-						<object class="IBToOneOutletInfo" key="imageView">
-							<string key="name">imageView</string>
-							<string key="candidateClassName">NSImageView</string>
-						</object>
 						<object class="IBToOneOutletInfo" key="lockOnSleepCheckButton">
 							<string key="name">lockOnSleepCheckButton</string>
 							<string key="candidateClassName">NSButton</string>
@@ -1512,6 +1507,14 @@
 						<string key="minorKey">./Classes/MPGeneralSettingsController.h</string>
 					</object>
 				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">MPViewController</string>
+					<string key="superclassName">NSViewController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MPViewController.h</string>
+					</object>
+				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">NSLayoutConstraint</string>
 					<string key="superclassName">NSObject</string>
diff --git a/MacPass/Kdb3Tree+NewTree.h b/MacPass/Kdb3Tree+NewTree.h
index 47ce4d17..759cfffd 100644
--- a/MacPass/Kdb3Tree+NewTree.h
+++ b/MacPass/Kdb3Tree+NewTree.h
@@ -10,6 +10,6 @@
 
 @interface Kdb3Tree (NewTree)
 
-+ (Kdb3Tree *)newTemplateTree;
++ (Kdb3Tree *)templateTree;
 
 @end
diff --git a/MacPass/Kdb3Tree+NewTree.m b/MacPass/Kdb3Tree+NewTree.m
index b1934a54..b228d5aa 100644
--- a/MacPass/Kdb3Tree+NewTree.m
+++ b/MacPass/Kdb3Tree+NewTree.m
@@ -10,7 +10,7 @@
 
 @implementation Kdb3Tree (NewTree)
 
-+ (Kdb3Tree *)newTemplateTree {
++ (Kdb3Tree *)templateTree {
   Kdb3Tree *tree = [[Kdb3Tree alloc] init];
   
   Kdb3Group *rootGroup = [[Kdb3Group alloc] init];
@@ -49,7 +49,7 @@
   
   [rootGroup release];
 
-  return tree;
+  return [tree autorelease];
 }
 
 @end
diff --git a/MacPass/Kdb4Tree+NewTree.h b/MacPass/Kdb4Tree+NewTree.h
index bfd5150c..395c871c 100644
--- a/MacPass/Kdb4Tree+NewTree.h
+++ b/MacPass/Kdb4Tree+NewTree.h
@@ -10,6 +10,6 @@
 
 @interface Kdb4Tree (NewTree)
 
-+(Kdb4Tree *)newTemplateTree;
++(Kdb4Tree *)templateTree;
 
 @end
diff --git a/MacPass/Kdb4Tree+NewTree.m b/MacPass/Kdb4Tree+NewTree.m
index 91ab7e58..e227e03a 100644
--- a/MacPass/Kdb4Tree+NewTree.m
+++ b/MacPass/Kdb4Tree+NewTree.m
@@ -10,7 +10,7 @@
 
 @implementation Kdb4Tree (NewTree)
 
-+ (Kdb4Tree *)newTemplateTree {
++ (Kdb4Tree *)templateTree {
   NSDate *currentTime = [NSDate date];
   
   Kdb4Tree *tree = [[Kdb4Tree alloc] init];
@@ -71,7 +71,7 @@
   group.image = 37;
   [parentGroup addGroup:group];
   
-  return tree;
+  return [tree autorelease];
 }
 
 @end
diff --git a/MacPass/MPDocument.h b/MacPass/MPDocument.h
index 6a2cc424..f51a592e 100644
--- a/MacPass/MPDocument.h
+++ b/MacPass/MPDocument.h
@@ -25,6 +25,7 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 @class UUID;
 @class Binary;
 @class BinaryRef;
+@class MPRootAdapter;
 
 @interface MPDocument : NSDocument
 
@@ -34,11 +35,13 @@ APPKIT_EXTERN NSString *const MPDocumentGroupKey;
 @property (assign, getter = isLocked) BOOL locked;
 /* true, if document is loaded and decrypted (tree is loaded) */
 @property (assign, readonly, getter = isDecrypted) BOOL decrypted;
-@property (retain, readonly) KdbTree *tree;
+@property (retain, readonly, nonatomic) KdbTree *tree;
 @property (assign, readonly, nonatomic) KdbGroup *root;
+@property (readonly, retain) MPRootAdapter *rootAdapter;
 @property (nonatomic, retain) NSString *password;
 @property (nonatomic, retain) NSURL *key;
 @property (assign, readonly) MPDatabaseVersion version;
+@property (assign, readonly, getter = isReadOnly) BOOL readOnly;
 
 - (id)initWithVersion:(MPDatabaseVersion)version;
 - (BOOL)decryptWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL;
diff --git a/MacPass/MPDocument.m b/MacPass/MPDocument.m
index 15bc6358..4d656c4e 100644
--- a/MacPass/MPDocument.m
+++ b/MacPass/MPDocument.m
@@ -12,7 +12,10 @@
 #import "Kdb3Node.h"
 #import "Kdb4Node.h"
 #import "KdbPassword.h"
+
 #import "MPDatabaseVersion.h"
+#import "MPRootAdapter.h"
+
 #import "KdbGroup+Undo.h"
 #import "KdbGroup+KVOAdditions.h"
 #import "KdbGroup+MPTreeTools.h"
@@ -30,14 +33,22 @@ NSString *const MPDocumentEntryKey                    = @"MPDocumentEntryKey";
 NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 
 
-@interface MPDocument ()
+@interface MPDocument () {
+@private
+  BOOL _didLockFile;
+}
 
-@property (assign, nonatomic) BOOL secured;
-@property (retain) KdbTree *tree;
+
+@property (retain, nonatomic) KdbTree *tree;
 @property (assign, nonatomic) KdbGroup *root;
 @property (nonatomic, readonly) KdbPassword *passwordHash;
 @property (assign) MPDatabaseVersion version;
+
+@property (assign, nonatomic) BOOL secured;
 @property (assign) BOOL decrypted;
+@property (assign) BOOL readOnly;
+
+@property (retain) NSURL *lockFileURL;
 
 @end
 
@@ -52,15 +63,18 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 - (id)initWithVersion:(MPDatabaseVersion)version {
   self = [super init];
   if(self) {
+    _didLockFile = NO;
     _decrypted = YES;
     _secured = NO;
     _locked = NO;
+    _readOnly = NO;
+    _rootAdapter = [[MPRootAdapter alloc] init];
     switch(version) {
       case MPDatabaseVersion3:
-        _tree = [Kdb3Tree newTemplateTree];
+        self.tree = [Kdb3Tree templateTree];
         break;
       case MPDatabaseVersion4:
-        _tree = [Kdb4Tree newTemplateTree];
+        self.tree = [Kdb4Tree templateTree];
         break;
       default:
         [self release];
@@ -71,9 +85,12 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 }
 
 - (void)dealloc {
+  [self _cleanupLock];
   [_tree release];
   [_password release];
   [_key release];
+  [_lockFileURL release];
+  [_rootAdapter release];
   [super dealloc];
 }
 
@@ -99,12 +116,20 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 }
 
 - (BOOL)readFromURL:(NSURL *)url ofType:(NSString *)typeName error:(NSError **)outError {
+  self.lockFileURL = [url URLByAppendingPathExtension:@"lock"];
+  if([[NSFileManager defaultManager] fileExistsAtPath:[_lockFileURL path]]) {
+    self.readOnly = YES;
+  }
+  else {
+    [[NSFileManager defaultManager] createFileAtPath:[_lockFileURL path] contents:nil attributes:nil];
+    _didLockFile = YES;
+  }
   self.decrypted = NO;
   return YES;
 }
 
 - (BOOL)revertToContentsOfURL:(NSURL *)absoluteURL ofType:(NSString *)typeName error:(NSError **)outError {
-  [self _resetTree];
+  self.tree = nil;
   if([self readFromURL:absoluteURL ofType:typeName error:outError]) {
     [[NSNotificationCenter defaultCenter] postNotificationName:MPDocumentDidRevertNotifiation object:self];
     return YES;
@@ -116,7 +141,18 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   return _decrypted;
 }
 
+- (void)close {
+  [self _cleanupLock];
+  [super close];
+}
+
+- (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)anItem {
+  NSLog(@"Validating %@", anItem);
+  return YES;
+}
+
 #pragma mark Protection
+
 - (BOOL)decryptWithPassword:(NSString *)password keyFileURL:(NSURL *)keyFileURL {
   self.key = keyFileURL;
   self.password = [password length] > 0 ? password : nil;
@@ -133,9 +169,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   else if( [self.tree isKindOfClass:[Kdb3Tree class]]) {
     self.version = MPDatabaseVersion3;
   }
-  /* reset the root to inform KVO listeners */
-  self.root = self.tree.root;
-  _decrypted = YES;
+  self.decrypted = YES;
   return YES;
 }
 
@@ -166,14 +200,16 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 }
 
 #pragma mark Data Accesors
-- (KdbGroup *)root {
-  return self.tree.root;
+- (void)setTree:(KdbTree *)tree {
+  if(_tree != tree) {
+    [_tree release];
+    _tree = [tree retain];
+    self.rootAdapter.tree = _tree;
+  }
 }
 
-- (void)setRoot:(KdbGroup *)root {
-  if(self.root != root) {
-    self.tree.root = root;
-  }
+- (KdbGroup *)root {
+  return self.tree.root;
 }
 
 - (KdbEntry *)findEntry:(UUID *)uuid {
@@ -232,6 +268,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
     return NO;
   }
   BOOL isMovable = YES;
+  
   KdbGroup *ancestor = target.parent;
   while(ancestor.parent) {
     if(ancestor == group) {
@@ -290,10 +327,11 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 }
 
 #pragma mark Private 
-- (void)_resetTree {
-  // Reset both values to inform any KVO listener
-  self.root = nil;
-  self.tree = nil;
+- (void)_cleanupLock {
+  if(_didLockFile) {
+    [[NSFileManager defaultManager] removeItemAtURL:_lockFileURL error:nil];
+    _didLockFile = NO;
+  }
 }
 
 @end
diff --git a/MacPass/MPDocumentWindowController.m b/MacPass/MPDocumentWindowController.m
index 11b7c5cb..2bfa07dd 100644
--- a/MacPass/MPDocumentWindowController.m
+++ b/MacPass/MPDocumentWindowController.m
@@ -176,10 +176,12 @@ NSString *const MPCurrentItemChangedNotification = @"com.hicknhack.macpass.MPCur
 }
 
 - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
-  return YES;
+  MPDocument *document = [self document];
+  return !( document.isLocked || document.isReadOnly );
 }
 
 - (BOOL)validateToolbarItem:(NSToolbarItem *)theItem {
+  NSLog(@"Validate ToolbarItem: %@", theItem);
   MPDocument *document = [self document];
   if(document.isLocked) {
     return NO;
diff --git a/MacPass/MPInspectorViewController.m b/MacPass/MPInspectorViewController.m
index 553af7ee..85447f2b 100644
--- a/MacPass/MPInspectorViewController.m
+++ b/MacPass/MPInspectorViewController.m
@@ -22,6 +22,7 @@
 #import "Kdb3Node.h"
 #import "KdbGroup+Undo.h"
 #import "KdbEntry+Undo.h"
+#import "NSMutableData+Base64.h"
 
 #import "HNHGradientView.h"
 
@@ -299,8 +300,9 @@ enum {
     Kdb4Entry *entry = (Kdb4Entry *)self.selectedEntry;
     BinaryRef *binaryRef = entry.binaries[row];
     [[view textField] bind:NSValueBinding toObject:binaryRef withKeyPath:@"key" options:nil];
-//    MPDocument *document = [[self windowController] document];
-//    [document binaryForRef:binaryRef];
+    MPDocument *document = [[self windowController] document];
+    Binary *binary = [document binaryForRef:binaryRef];
+    NSLog(@"%@", binary.data);
   }
   return view;
 }
diff --git a/MacPass/MPOutlineDataSource.m b/MacPass/MPOutlineDataSource.m
index d4b1587f..0636d780 100644
--- a/MacPass/MPOutlineDataSource.m
+++ b/MacPass/MPOutlineDataSource.m
@@ -8,11 +8,15 @@
 
 #import "MPOutlineDataSource.h"
 #import "MPDocument.h"
+#import "MPConstants.h"
+#import "MPRootAdapter.h"
+
 #import "KdbLib.h"
 #import "KdbGroup+Undo.h"
 #import "KdbGroup+MPTreeTools.h"
 #import "KdbEntry+MPTreeTools.h"
-#import "MPConstants.h"
+
+
 #import "UUID.h"
 
 @implementation MPOutlineDataSource
@@ -37,12 +41,16 @@
       oprationMask = NSDragOperationCopy;
     }
     
-    KdbGroup *target = [item representedObject];
-    if( target == nil) {
-      return oprationMask; // Draggin over root
+    id targetItem = [item representedObject];
+    if(targetItem == nil) {
+      return NSDragOperationNone; // no Target
     }
+    if([targetItem isKindOfClass:[MPRootAdapter class]]) {
+      return NSDragOperationNone; // Drag over group header
+    }
+    KdbGroup *targetGroup = targetItem;
     BOOL validTarget = YES;
-    if( _draggedItem.parent == target ) {
+    if( _draggedItem.parent == targetGroup ) {
       validTarget &= index != NSOutlineViewDropOnItemIndex;
       validTarget &= index != [_draggedItem.parent.groups indexOfObject:_draggedItem];
     }
diff --git a/MacPass/MPOutlineViewController.m b/MacPass/MPOutlineViewController.m
index 16dce1f6..009292b5 100644
--- a/MacPass/MPOutlineViewController.m
+++ b/MacPass/MPOutlineViewController.m
@@ -9,14 +9,15 @@
 #import "MPOutlineViewController.h"
 #import "MPOutlineDataSource.h"
 #import "MPDocument.h"
-#import "MPAppDelegate.h"
 #import "MPContextMenuHelper.h"
 #import "MPConstants.h"
 #import "MPActionHelper.h"
 #import "MPIconHelper.h"
 #import "MPUppercaseStringValueTransformer.h"
+#import "MPRootAdapter.h"
 
 #import "KdbLib.h"
+#import "Kdb4Node.h"
 #import "KdbGroup+Undo.h"
 
 #import "HNHGradientView.h"
@@ -78,7 +79,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
   if(!_bindingEstablished) {
     MPDocument *document = [[self windowController] document];
     [_treeController setChildrenKeyPath:@"groups"];
-    [_treeController bind:NSContentBinding toObject:document withKeyPath:@"root" options:nil];
+    [_treeController bind:NSContentBinding toObject:document withKeyPath:@"rootAdapter" options:nil];
     [_outlineView bind:NSContentBinding toObject:_treeController withKeyPath:@"arrangedObjects" options:nil];
     [_outlineView setDataSource:self.datasource];
     _bindingEstablished = YES;
@@ -154,16 +155,14 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
 
 #pragma mark NSOutlineViewDelegate
 - (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTableColumn *)tableColumn item:(id)item {
-  NSTreeNode *treeNode = item;
-  KdbGroup *group = [treeNode representedObject];
-  //KdbGroup *group = item;
   NSTableCellView *view;
-  if(![group parent]) {
-    NSDictionary *options = @{ NSValueTransformerBindingOption : [NSValueTransformer valueTransformerForName:MPUppsercaseStringValueTransformerName] };
+  if( [self _itemIsRootNodeAdapter:item] ) {
+    //NSDictionary *options = @{ NSValueTransformerBindingOption : [NSValueTransformer valueTransformerForName:MPUppsercaseStringValueTransformerName] };
     view = [outlineView makeViewWithIdentifier:_MPOutlinveViewHeaderViewIdentifier owner:self];
-    [view.textField bind:NSValueBinding toObject:group withKeyPath:@"name" options:options];
+    [view.textField setStringValue:NSLocalizedString(@"GROUPS", @"")];
   }
   else {
+    KdbGroup *group = [item representedObject];
     view = [outlineView makeViewWithIdentifier:_MPOutlineViewDataViewIdentifier owner:self];
     NSImage *icon = [MPIconHelper icon:(MPIconType)[group image]];
     [view.imageView setImage:icon];
@@ -175,20 +174,11 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
 }
 
 - (BOOL)outlineView:(NSOutlineView *)outlineView isGroupItem:(id)item {
-  NSTreeNode *treeNode = item;
-  KdbGroup *group = [treeNode representedObject];
-  //KdbGroup *group = item;
-  if(!group.parent) {
-    return YES;
-  }
-  return NO;
+  return [self _itemIsRootNodeAdapter:item];
 }
 
 - (BOOL)outlineView:(NSOutlineView *)outlineView shouldSelectItem:(id)item {
-  NSTreeNode *treeNode = item;
-  KdbGroup *group = [treeNode representedObject];
-  //KdbGroup *group = item;
-  return (nil != [group parent]);
+  return ![self _itemIsRootNodeAdapter:item];
 }
 
 - (void)outlineViewSelectionDidChange:(NSNotification *)notification {
@@ -199,9 +189,7 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
 }
 
 - (BOOL)outlineView:(NSOutlineView *)outlineView shouldShowOutlineCellForItem:(id)item {
-  return YES;
-  //  KdbGroup *group = [item representedObject];
-  //  return (nil != group.parent);
+  return ![self _itemIsRootNodeAdapter:item];
 }
 
 #pragma mark -
@@ -224,4 +212,9 @@ NSString *const _MPOutlinveViewHeaderViewIdentifier = @"HeaderCell";
   return [menu autorelease];
 }
 
+- (BOOL)_itemIsRootNodeAdapter:(id)item {
+  id node = [item representedObject];
+  return [node isKindOfClass:[MPRootAdapter class]];
+}
+
 @end
diff --git a/MacPass/MPRootAdapter.h b/MacPass/MPRootAdapter.h
new file mode 100644
index 00000000..54843f0f
--- /dev/null
+++ b/MacPass/MPRootAdapter.h
@@ -0,0 +1,18 @@
+//
+//  MPRootAdapter.h
+//  MacPass
+//
+//  Created by Michael Starke on 26.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class KdbTree;
+
+@interface MPRootAdapter : NSObject
+
+@property (readonly, retain) NSArray *groups;
+@property (nonatomic, retain) KdbTree *tree;
+
+@end
diff --git a/MacPass/MPRootAdapter.m b/MacPass/MPRootAdapter.m
new file mode 100644
index 00000000..5bb66214
--- /dev/null
+++ b/MacPass/MPRootAdapter.m
@@ -0,0 +1,33 @@
+//
+//  MPRootAdapter.m
+//  MacPass
+//
+//  Created by Michael Starke on 26.06.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPRootAdapter.h"
+#import "Kdb.h"
+
+@interface MPRootAdapter ()
+
+@property (retain) NSArray *groups;
+
+@end
+
+@implementation MPRootAdapter
+
+- (void)dealloc {
+  [_groups release];
+  [super dealloc];
+}
+
+- (void)setTree:(KdbTree *)tree {
+  if(_tree != tree) {
+    [_tree release];
+    _tree = [tree retain];
+    self.groups = @[_tree.root];
+  }
+}
+
+@end
diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist
index b8f8cbdc..9fe76b7f 100644
--- a/MacPass/MacPass-Info.plist
+++ b/MacPass/MacPass-Info.plist
@@ -48,7 +48,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1175</string>
+	<string>1224</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>
diff --git a/MacPass/de.lproj/Localizable.strings b/MacPass/de.lproj/Localizable.strings
index 52ebd829..9a3db7db 100644
Binary files a/MacPass/de.lproj/Localizable.strings and b/MacPass/de.lproj/Localizable.strings differ
diff --git a/MacPass/en.lproj/Localizable.strings b/MacPass/en.lproj/Localizable.strings
index b4c89ab9..b8d40af4 100644
Binary files a/MacPass/en.lproj/Localizable.strings and b/MacPass/en.lproj/Localizable.strings differ