diff --git a/Medianno/MAAppController.h b/Medianno/MAAppController.h
index a0a484e..367bb5f 100644
--- a/Medianno/MAAppController.h
+++ b/Medianno/MAAppController.h
@@ -7,6 +7,7 @@
 //
 
 #import <Cocoa/Cocoa.h>
+#import "MAMovieWindow.h"
 
 typedef void (^MASheetBlock)(NSInteger returnCode);
 
@@ -16,6 +17,9 @@ typedef void (^MASheetBlock)(NSInteger returnCode);
 
 @end
 
-@interface MAAppController : NSObject <NSApplicationDelegate>
+@interface MAAppController : NSObject <NSApplicationDelegate> {
+}
+
+@property (assign)     IBOutlet MAMovieWindow *    moviePanel;
 
 @end
diff --git a/Medianno/MAAppController.mm b/Medianno/MAAppController.mm
index 66839c3..3141814 100644
--- a/Medianno/MAAppController.mm
+++ b/Medianno/MAAppController.mm
@@ -8,6 +8,16 @@
 
 #import "MAAppController.h"
 
+@implementation MAAppController
+
+@synthesize moviePanel;
+
+- (void)applicationDidFinishLaunching:(NSNotification *)notification
+{
+    [[NSDocumentController sharedDocumentController] setAutosavingDelay:30.0];
+}
+
+@end
 
 @implementation NSApplication (SheetAdditions)
 
@@ -28,12 +38,3 @@
 }
 
 @end
-
-@implementation MAAppController
-
-- (void)applicationDidFinishLaunching:(NSNotification *)notification
-{
-    [[NSDocumentController sharedDocumentController] setAutosavingDelay:30.0];
-}
-
-@end
diff --git a/Medianno/MADocWindow.h b/Medianno/MADocWindow.h
index 64562f4..82fbe16 100644
--- a/Medianno/MADocWindow.h
+++ b/Medianno/MADocWindow.h
@@ -35,8 +35,9 @@
 - (IBAction)mediaSkipBackward:(id)sender;
 - (IBAction)mediaSkipForward:(id)sender;
 - (IBAction)toggleMediaPlay:(id)sender;
-- (IBAction)toggleMoviePanel:(id)sender;
 - (QTTime)currentMovieTime;
+- (void)moviePanelDidAppear;
+- (void)moviePanelDidClose;
 
 @end
 
diff --git a/Medianno/MADocWindow.mm b/Medianno/MADocWindow.mm
index e7859c9..6b598d8 100644
--- a/Medianno/MADocWindow.mm
+++ b/Medianno/MADocWindow.mm
@@ -16,6 +16,7 @@
 #import "MATag.h"
 #import "MATagDescription.h"
 #import "MAMovieWindow.h"
+#import "MAAppController.h"
 
 static const char * kMADocWindowObserver = "MADocWindowObserver";
 
@@ -39,7 +40,34 @@ static const char * kMADocWindowObserver = "MADocWindowObserver";
     [annotationController setSortDescriptors:[NSArray arrayWithObject:[NSSortDescriptor sortDescriptorWithKey:@"location" ascending:YES]]];
     [NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(updateMovieTime:) userInfo:nil repeats:YES];
     [mediaController addObserver:self forKeyPath:@"selection.media" options:0 context:&kMADocWindowObserver];
-    [moviePanel addObserver:self forKeyPath:@"showMovieInPanel" options:0 context:&kMADocWindowObserver];
+}
+
+- (MAMovieWindow *)moviePanel
+{
+    return [[NSApp delegate] moviePanel];
+}
+
+- (void)moviePanelDidAppear
+{
+    [movieView setMovie:nil];
+    if (![[self moviePanel] shouldDisplayMovie:currentMovie])
+        [movieView setMovie:currentMovie];
+}
+
+- (void)windowDidBecomeMain:(NSNotification *)notification
+{
+    [self moviePanelDidAppear];
+}
+
+- (void)moviePanelDidClose
+{
+    [[self moviePanel] shouldDisplayMovie:nil];
+    [movieView setMovie:currentMovie];
+}
+
+- (void)windowDidResignMain:(NSNotification *)notification
+{
+    [self moviePanelDidClose];
 }
 
 - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
@@ -52,20 +80,10 @@ static const char * kMADocWindowObserver = "MADocWindowObserver";
             MAMedia * currentMedia = [mediaController selection];
             currentMovie = [[QTMovie alloc] initWithFile:[currentMedia valueForKey:@"media"] error:nil];
         }
-        [moviePanel setMovie:currentMovie];
+        [self moviePanelDidAppear];
     }
 }
 
-- (void)windowDidBecomeMain:(NSNotification *)notification
-{
-    [moviePanel setMainWindowIsFront:YES];
-}
-
-- (void)windowDidResignMain:(NSNotification *)notification
-{
-    [moviePanel setMainWindowIsFront:NO];
-}
-
 #pragma mark Media management
 
 - (QTTime)currentMovieTime
@@ -223,11 +241,6 @@ static const char * kMADocWindowObserver = "MADocWindowObserver";
         [currentMovie play];
 }
 
-- (IBAction)toggleMoviePanel:(id)sender
-{
-    [moviePanel setMoviePanelEnabled:![moviePanel moviePanelEnabled]];
-}
-
 - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
 {
     if ([item action] == @selector(addMediaFiles:) 
@@ -237,11 +250,6 @@ static const char * kMADocWindowObserver = "MADocWindowObserver";
         return YES;
   
     NSMenuItem * menuItem = (NSMenuItem *)item;
-    if ([item action] == @selector(toggleMoviePanel:)) {
-        [menuItem setState:[moviePanel moviePanelEnabled]];
-        
-        return YES;
-    }
     if ([item action] == @selector(toggleMediaPlay:)) {
          if ([currentMovie rate] > 0.0f)
             [menuItem setTitle:NSLocalizedString(@"Pause", @"Pause playback")];
@@ -337,7 +345,7 @@ static NSTimeInterval sLastSkip = 0.0;
 
 - (IBAction)addAnnotation:(id)sender
 {
-    [movieView pause:sender];
+    [currentMovie stop];
     QTTime location = [self currentMovieTime];
     MAAnno * anno   = [[self document] addAnnotationForMedia:[[mediaController selectedObjects] objectAtIndex:0] location:location];
     [annotationController setSelectedObjects:[NSArray arrayWithObject:anno]];
diff --git a/Medianno/MAMovieWindow.h b/Medianno/MAMovieWindow.h
index f53d1f7..d2c088d 100644
--- a/Medianno/MAMovieWindow.h
+++ b/Medianno/MAMovieWindow.h
@@ -9,17 +9,12 @@
 #import <Cocoa/Cocoa.h>
 #import <QTKit/QTKit.h>
 
-@interface MAMovieWindow : NSWindowController {
-    IBOutlet NSWindow *             mainWindow;
-    IBOutlet QTMovieView *          mainMovieView;
-    IBOutlet QTMovieView *          panelMovieView;
+@interface MAMovieWindow : NSWindowController <NSWindowDelegate> {
+    IBOutlet QTMovieView *  panelMovieView;
 }
 
-@property BOOL  mainWindowIsFront, moviePanelEnabled;
-
-- (BOOL)showMovieInPanel;
-+ (NSSet *)keyPathsForValuesAffectingShowMovieInPanel;
-- (void)setMovie:(QTMovie *)movie;
+- (BOOL)shouldDisplayMovie:(QTMovie *)movie;
+- (IBAction)toggleWindow:(id)sender;
 
 @end
 
diff --git a/Medianno/MAMovieWindow.m b/Medianno/MAMovieWindow.m
index 202451b..abd7dae 100644
--- a/Medianno/MAMovieWindow.m
+++ b/Medianno/MAMovieWindow.m
@@ -7,11 +7,10 @@
 //
 
 #import "MAMovieWindow.h"
+#import "MADocWindow.h"
 
 @implementation MAMovieWindow
 
-@synthesize moviePanelEnabled, mainWindowIsFront;
-
 - (id)init
 {
     self              = [super initWithWindowNibName:@"MAMovie"];
@@ -24,39 +23,32 @@
     [super windowDidLoad];
 }
 
-- (void)setMoviePanelEnabled:(BOOL)enabled
+- (BOOL)shouldDisplayMovie:(QTMovie *)movie
 {
-    if ((self->moviePanelEnabled = enabled))
-        [self loadWindow];
-    
-    [self setMainWindowIsFront:[mainWindow isMainWindow]];    
-}
-
-- (BOOL)showMovieInPanel
-{
-    return moviePanelEnabled && mainWindowIsFront;
-}
-
-- (void)setShowMovieInPanel:(BOOL)showIt
-{
-    moviePanelEnabled = showIt;
-}
-
-+ (NSSet *)keyPathsForValuesAffectingShowMovieInPanel
-{
-    return [NSSet setWithObjects:@"moviePanelEnabled", @"mainWindowIsFront", nil];
-}
-
-- (void)setMovie:(QTMovie *)movie
-{
-    if ([self showMovieInPanel]) {
+    if ([self isWindowLoaded] && [[self window] isVisible]) {
         [panelMovieView setMovie:movie];
-        [mainMovieView setMovie:nil];
+        return YES;
     } else {
-        [mainMovieView setMovie:movie];
         [panelMovieView setMovie:nil];
+        return NO;
     }
 }
+
+- (IBAction)toggleWindow:(id)sender
+{
+    if ([self isWindowLoaded] && [[self window] isVisible]) {
+        [self close];
+    } else {
+        [[self window] orderFront:sender];
+        [[[NSApp mainWindow] windowController] moviePanelDidAppear];
+    }
+}
+
+- (void)windowWillClose:(NSNotification *)notification
+{
+    [[[NSApp mainWindow] windowController] moviePanelDidClose];    
+}
+
 @end
 
 @implementation MAMovieWin
diff --git a/Medianno/en.lproj/MADocument.xib b/Medianno/en.lproj/MADocument.xib
index e5db017..0a9d73d 100644
--- a/Medianno/en.lproj/MADocument.xib
+++ b/Medianno/en.lproj/MADocument.xib
@@ -99,7 +99,7 @@
 													<string key="NSFrameSize">{1279, 183}</string>
 													<reference key="NSSuperview" ref="204692115"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="332479500"/>
+													<reference key="NSNextKeyView" ref="502749411"/>
 													<string key="NSReuseIdentifierKey">_NS:1197</string>
 													<bool key="NSEnabled">YES</bool>
 													<object class="NSTableHeaderView" key="NSHeaderView" id="117432108">
@@ -339,7 +339,7 @@
 									<string key="NSFrameSize">{1281, 201}</string>
 									<reference key="NSSuperview" ref="196617426"/>
 									<reference key="NSWindow"/>
-									<reference key="NSNextKeyView" ref="502749411"/>
+									<reference key="NSNextKeyView" ref="204692115"/>
 									<string key="NSReuseIdentifierKey">_NS:1193</string>
 									<int key="NSsFlags">133682</int>
 									<reference key="NSVScroller" ref="332479500"/>
@@ -401,7 +401,7 @@
 																	<string key="NSFrameSize">{1278, 565}</string>
 																	<reference key="NSSuperview" ref="51131752"/>
 																	<reference key="NSWindow"/>
-																	<reference key="NSNextKeyView" ref="742629842"/>
+																	<reference key="NSNextKeyView" ref="794153134"/>
 																	<string key="NSReuseIdentifierKey">_NS:1197</string>
 																	<bool key="NSEnabled">YES</bool>
 																	<object class="NSTableHeaderView" key="NSHeaderView" id="995480265">
@@ -548,7 +548,6 @@
 															<string key="NSFrame">{{1, 566}, {1279, 15}}</string>
 															<reference key="NSSuperview" ref="1054473103"/>
 															<reference key="NSWindow"/>
-															<reference key="NSNextKeyView"/>
 															<string key="NSReuseIdentifierKey">_NS:1216</string>
 															<int key="NSsFlags">1</int>
 															<reference key="NSTarget" ref="1054473103"/>
@@ -574,7 +573,7 @@
 													<string key="NSFrameSize">{1280, 583}</string>
 													<reference key="NSSuperview" ref="1058980817"/>
 													<reference key="NSWindow"/>
-													<reference key="NSNextKeyView" ref="794153134"/>
+													<reference key="NSNextKeyView" ref="51131752"/>
 													<string key="NSReuseIdentifierKey">_NS:1193</string>
 													<int key="NSsFlags">133682</int>
 													<reference key="NSVScroller" ref="715872882"/>
@@ -787,9 +786,6 @@
 				<int key="NSTitlePosition">0</int>
 				<bool key="NSTransparent">NO</bool>
 			</object>
-			<object class="NSCustomObject" id="779371356">
-				<string key="NSClassName">MAMovieWindow</string>
-			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -1335,38 +1331,6 @@
 					</object>
 					<int key="connectionID">100248</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">moviePanel</string>
-						<reference key="source" ref="512844837"/>
-						<reference key="destination" ref="779371356"/>
-					</object>
-					<int key="connectionID">100250</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">mainWindow</string>
-						<reference key="source" ref="779371356"/>
-						<reference key="destination" ref="275939982"/>
-					</object>
-					<int key="connectionID">100252</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">mediaController</string>
-						<reference key="source" ref="779371356"/>
-						<reference key="destination" ref="261388520"/>
-					</object>
-					<int key="connectionID">100255</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">mainMovieView</string>
-						<reference key="source" ref="779371356"/>
-						<reference key="destination" ref="56699403"/>
-					</object>
-					<int key="connectionID">100260</int>
-				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -1755,12 +1719,6 @@
 						<reference key="object" ref="397127771"/>
 						<reference key="parent" ref="1023793026"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100249</int>
-						<reference key="object" ref="779371356"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Movie Panel</string>
-					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1825,7 +1783,6 @@
 					<string>100237.IBPluginDependency</string>
 					<string>100238.IBPluginDependency</string>
 					<string>100239.IBPluginDependency</string>
-					<string>100249.IBPluginDependency</string>
 					<string>5.IBNSWindowAutoPositionCentersHorizontal</string>
 					<string>5.IBNSWindowAutoPositionCentersVertical</string>
 					<string>5.IBPluginDependency</string>
@@ -1901,7 +1858,6 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<boolean value="NO"/>
 					<boolean value="NO"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2094,42 +2050,14 @@
 					<string key="className">MAMovieWindow</string>
 					<string key="superclassName">NSWindowController</string>
 					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>mainMovieView</string>
-							<string>mainWindow</string>
-							<string>panelMovieView</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>QTMovieView</string>
-							<string>NSWindow</string>
-							<string>QTMovieView</string>
-						</object>
+						<string key="NS.key.0">panelMovieView</string>
+						<string key="NS.object.0">QTMovieView</string>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>mainMovieView</string>
-							<string>mainWindow</string>
-							<string>panelMovieView</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">mainMovieView</string>
-								<string key="candidateClassName">QTMovieView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">mainWindow</string>
-								<string key="candidateClassName">NSWindow</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">panelMovieView</string>
-								<string key="candidateClassName">QTMovieView</string>
-							</object>
+						<string key="NS.key.0">panelMovieView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">panelMovieView</string>
+							<string key="candidateClassName">QTMovieView</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/Medianno/en.lproj/MAMovie.xib b/Medianno/en.lproj/MAMovie.xib
index cae23af..641713b 100644
--- a/Medianno/en.lproj/MAMovie.xib
+++ b/Medianno/en.lproj/MAMovie.xib
@@ -99,6 +99,7 @@
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
 				<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
+				<string key="NSFrameAutosaveName">MAMoviePanel</string>
 				<bool key="NSWindowIsRestorable">YES</bool>
 			</object>
 		</object>
@@ -113,22 +114,6 @@
 					</object>
 					<int key="connectionID">5</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">visible: showMovieInPanel</string>
-						<reference key="source" ref="633460828"/>
-						<reference key="destination" ref="1001"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="633460828"/>
-							<reference key="NSDestination" ref="1001"/>
-							<string key="NSLabel">visible: showMovieInPanel</string>
-							<string key="NSBinding">visible</string>
-							<string key="NSKeyPath">showMovieInPanel</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">9</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">panelMovieView</string>
@@ -137,6 +122,14 @@
 					</object>
 					<int key="connectionID">12</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="633460828"/>
+						<reference key="destination" ref="1001"/>
+					</object>
+					<int key="connectionID">13</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -226,7 +219,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">12</int>
+			<int key="maxID">13</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -242,43 +235,26 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">MAMovieWindow</string>
 					<string key="superclassName">NSWindowController</string>
-					<object class="NSMutableDictionary" key="outlets">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>mainMovieView</string>
-							<string>mainWindow</string>
-							<string>panelMovieView</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>QTMovieView</string>
-							<string>NSWindow</string>
-							<string>QTMovieView</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">toggleWindow:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">toggleWindow:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">toggleWindow:</string>
+							<string key="candidateClassName">id</string>
 						</object>
 					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">panelMovieView</string>
+						<string key="NS.object.0">QTMovieView</string>
+					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSArray" key="dict.sortedKeys">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>mainMovieView</string>
-							<string>mainWindow</string>
-							<string>panelMovieView</string>
-						</object>
-						<object class="NSMutableArray" key="dict.values">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<object class="IBToOneOutletInfo">
-								<string key="name">mainMovieView</string>
-								<string key="candidateClassName">QTMovieView</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">mainWindow</string>
-								<string key="candidateClassName">NSWindow</string>
-							</object>
-							<object class="IBToOneOutletInfo">
-								<string key="name">panelMovieView</string>
-								<string key="candidateClassName">QTMovieView</string>
-							</object>
+						<string key="NS.key.0">panelMovieView</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">panelMovieView</string>
+							<string key="candidateClassName">QTMovieView</string>
 						</object>
 					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/Medianno/en.lproj/MainMenu.xib b/Medianno/en.lproj/MainMenu.xib
index 767816e..2dec51c 100644
--- a/Medianno/en.lproj/MainMenu.xib
+++ b/Medianno/en.lproj/MainMenu.xib
@@ -30,7 +30,7 @@
 		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1048">
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<object class="NSCustomObject" id="1021">
-				<string key="NSClassName">NSApplication</string>
+				<string key="NSClassName">MAAppController</string>
 			</object>
 			<object class="NSCustomObject" id="1014">
 				<string key="NSClassName">FirstResponder</string>
@@ -945,6 +945,9 @@
 			<object class="NSCustomObject" id="114381833">
 				<string key="NSClassName">MAAppController</string>
 			</object>
+			<object class="NSCustomObject" id="594697277">
+				<string key="NSClassName">MAMovieWindow</string>
+			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -981,14 +984,6 @@
 					</object>
 					<int key="connectionID">127</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">orderFrontStandardAboutPanel:</string>
-						<reference key="source" ref="1021"/>
-						<reference key="destination" ref="238522557"/>
-					</object>
-					<int key="connectionID">142</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">performClose:</string>
@@ -1373,14 +1368,6 @@
 					</object>
 					<int key="connectionID">582</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">delegate</string>
-						<reference key="source" ref="1050"/>
-						<reference key="destination" ref="114381833"/>
-					</object>
-					<int key="connectionID">584</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
 						<string key="label">exportMedia:</string>
@@ -1405,13 +1392,37 @@
 					</object>
 					<int key="connectionID">598</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">moviePanel</string>
+						<reference key="source" ref="114381833"/>
+						<reference key="destination" ref="594697277"/>
+					</object>
+					<int key="connectionID">607</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">toggleMoviePanel:</string>
-						<reference key="source" ref="1014"/>
+						<string key="label">orderFrontStandardAboutPanel:</string>
+						<reference key="source" ref="1050"/>
+						<reference key="destination" ref="238522557"/>
+					</object>
+					<int key="connectionID">608</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">delegate</string>
+						<reference key="source" ref="1050"/>
+						<reference key="destination" ref="114381833"/>
+					</object>
+					<int key="connectionID">609</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">toggleWindow:</string>
+						<reference key="source" ref="594697277"/>
 						<reference key="destination" ref="801150906"/>
 					</object>
-					<int key="connectionID">601</int>
+					<int key="connectionID">610</int>
 				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -2135,6 +2146,12 @@
 						<reference key="object" ref="801150906"/>
 						<reference key="parent" ref="835318025"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">602</int>
+						<reference key="object" ref="594697277"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">Movie Panel</string>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -2235,6 +2252,7 @@
 					<string>593.IBPluginDependency</string>
 					<string>596.IBPluginDependency</string>
 					<string>600.IBPluginDependency</string>
+					<string>602.IBPluginDependency</string>
 					<string>72.IBPluginDependency</string>
 					<string>73.IBPluginDependency</string>
 					<string>74.IBPluginDependency</string>
@@ -2354,6 +2372,7 @@
 					<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">
@@ -2368,7 +2387,7 @@
 				<reference key="dict.values" ref="0"/>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">601</int>
+			<int key="maxID">610</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2394,6 +2413,17 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">MAAppController</string>
 					<string key="superclassName">NSObject</string>
+					<object class="NSMutableDictionary" key="outlets">
+						<string key="NS.key.0">moviePanel</string>
+						<string key="NS.object.0">MAMovieWindow</string>
+					</object>
+					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<string key="NS.key.0">moviePanel</string>
+						<object class="IBToOneOutletInfo" key="NS.object.0">
+							<string key="name">moviePanel</string>
+							<string key="candidateClassName">MAMovieWindow</string>
+						</object>
+					</object>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
 						<string key="minorKey">./Classes/MAAppController.h</string>
@@ -2558,14 +2588,25 @@
 				<object class="IBPartialClassDescription">
 					<string key="className">MAMovieWindow</string>
 					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<string key="NS.key.0">toggleWindow:</string>
+						<string key="NS.object.0">id</string>
+					</object>
+					<object class="NSMutableDictionary" key="actionInfosByName">
+						<string key="NS.key.0">toggleWindow:</string>
+						<object class="IBActionInfo" key="NS.object.0">
+							<string key="name">toggleWindow:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</object>
 					<object class="NSMutableDictionary" key="outlets">
-						<string key="NS.key.0">mainMovieView</string>
+						<string key="NS.key.0">panelMovieView</string>
 						<string key="NS.object.0">QTMovieView</string>
 					</object>
 					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<string key="NS.key.0">mainMovieView</string>
+						<string key="NS.key.0">panelMovieView</string>
 						<object class="IBToOneOutletInfo" key="NS.object.0">
-							<string key="name">mainMovieView</string>
+							<string key="name">panelMovieView</string>
 							<string key="candidateClassName">QTMovieView</string>
 						</object>
 					</object>