diff --git a/Cog.xcodeproj/project.pbxproj b/Cog.xcodeproj/project.pbxproj
index 9f2967a37..775f7b719 100644
--- a/Cog.xcodeproj/project.pbxproj
+++ b/Cog.xcodeproj/project.pbxproj
@@ -112,6 +112,8 @@
 		17D1B1680F632ABB00694C57 /* BlankZeroFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D1B1630F632ABB00694C57 /* BlankZeroFormatter.m */; };
 		17D1B1690F632ABB00694C57 /* IndexFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D1B1650F632ABB00694C57 /* IndexFormatter.m */; };
 		17D1B16A0F632ABB00694C57 /* SecondsFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 17D1B1670F632ABB00694C57 /* SecondsFormatter.m */; };
+		17D1B1DC0F6330D400694C57 /* Feedback.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B1DA0F6330D400694C57 /* Feedback.xib */; };
+		17D1B1E10F6330F000694C57 /* Update.xib in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B1DF0F6330F000694C57 /* Update.xib */; };
 		17D1B27D0CF8B2830028F5B5 /* cue.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B2760CF8B2830028F5B5 /* cue.icns */; };
 		17D1B27E0CF8B2830028F5B5 /* it.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B2770CF8B2830028F5B5 /* it.icns */; };
 		17D1B27F0CF8B2830028F5B5 /* pls.icns in Resources */ = {isa = PBXBuildFile; fileRef = 17D1B2780CF8B2830028F5B5 /* pls.icns */; };
@@ -671,6 +673,8 @@
 		17D1B1650F632ABB00694C57 /* IndexFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = IndexFormatter.m; path = Formatters/IndexFormatter.m; sourceTree = "<group>"; };
 		17D1B1660F632ABB00694C57 /* SecondsFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SecondsFormatter.h; path = Formatters/SecondsFormatter.h; sourceTree = "<group>"; };
 		17D1B1670F632ABB00694C57 /* SecondsFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SecondsFormatter.m; path = Formatters/SecondsFormatter.m; sourceTree = "<group>"; };
+		17D1B1DB0F6330D400694C57 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Feedback.xib; sourceTree = "<group>"; };
+		17D1B1E00F6330F000694C57 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/Update.xib; sourceTree = "<group>"; };
 		17D1B2760CF8B2830028F5B5 /* cue.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = cue.icns; sourceTree = "<group>"; };
 		17D1B2770CF8B2830028F5B5 /* it.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = it.icns; sourceTree = "<group>"; };
 		17D1B2780CF8B2830028F5B5 /* pls.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = pls.icns; sourceTree = "<group>"; };
@@ -1287,6 +1291,8 @@
 				17211A7C0D68B7C500911CA9 /* FileTree.xib */,
 				178456C00F6320B5007E8021 /* SpotlightPanel.xib */,
 				17E41E060C130DFF00AC744D /* Credits.html */,
+				17D1B1DA0F6330D400694C57 /* Feedback.xib */,
+				17D1B1DF0F6330F000694C57 /* Update.xib */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -1822,6 +1828,8 @@
 				17B7CF5E0F5A05EE00A47027 /* stopBadge.png in Resources */,
 				178456C30F6320B5007E8021 /* SpotlightPanel.xib in Resources */,
 				17D1B0D20F6320EA00694C57 /* InfoInspector.xib in Resources */,
+				17D1B1DC0F6330D400694C57 /* Feedback.xib in Resources */,
+				17D1B1E10F6330F000694C57 /* Update.xib in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2068,6 +2076,22 @@
 			name = InfoInspector.xib;
 			sourceTree = "<group>";
 		};
+		17D1B1DA0F6330D400694C57 /* Feedback.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				17D1B1DB0F6330D400694C57 /* English */,
+			);
+			name = Feedback.xib;
+			sourceTree = "<group>";
+		};
+		17D1B1DF0F6330F000694C57 /* Update.xib */ = {
+			isa = PBXVariantGroup;
+			children = (
+				17D1B1E00F6330F000694C57 /* English */,
+			);
+			name = Update.xib;
+			sourceTree = "<group>";
+		};
 		17E41E060C130DFF00AC744D /* Credits.html */ = {
 			isa = PBXVariantGroup;
 			children = (
diff --git a/English.lproj/Feedback.xib b/English.lproj/Feedback.xib
new file mode 100644
index 000000000..fc1e6fb6d
--- /dev/null
+++ b/English.lproj/Feedback.xib
@@ -0,0 +1,879 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03">
+	<data>
+		<int key="IBDocument.SystemTarget">1050</int>
+		<string key="IBDocument.SystemVersion">9G55</string>
+		<string key="IBDocument.InterfaceBuilderVersion">677</string>
+		<string key="IBDocument.AppKitVersion">949.43</string>
+		<string key="IBDocument.HIToolboxVersion">353.00</string>
+		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<integer value="3"/>
+		</object>
+		<object class="NSArray" key="IBDocument.PluginDependencies">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<string>com.apple.InterfaceBuilderKit</string>
+			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+		</object>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSArray" key="dict.sortedKeys">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+			<object class="NSMutableArray" key="dict.values">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+			</object>
+		</object>
+		<object class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<bool key="EncodedWithXMLCoder">YES</bool>
+			<object class="NSCustomObject" id="1001">
+				<string key="NSClassName">FeedbackController</string>
+			</object>
+			<object class="NSCustomObject" id="1003">
+				<string key="NSClassName">FirstResponder</string>
+			</object>
+			<object class="NSCustomObject" id="1004">
+				<string key="NSClassName">NSApplication</string>
+			</object>
+			<object class="NSWindowTemplate" id="90214653">
+				<int key="NSWindowStyleMask">3</int>
+				<int key="NSWindowBacking">2</int>
+				<string key="NSWindowRect">{{168, 357}, {480, 376}}</string>
+				<int key="NSWTFlags">1886912512</int>
+				<string key="NSWindowTitle">Send Feedback</string>
+				<string key="NSWindowClass">NSWindow</string>
+				<object class="NSMutableString" key="NSViewClass">
+					<characters key="NS.bytes">View</characters>
+				</object>
+				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+				<string key="NSWindowContentMinSize">{213, 107}</string>
+				<object class="NSView" key="NSWindowView" id="968759792">
+					<reference key="NSNextResponder"/>
+					<int key="NSvFlags">256</int>
+					<object class="NSMutableArray" key="NSSubviews">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSTextField" id="525062810">
+							<reference key="NSNextResponder" ref="968759792"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{80, 295}, {356, 22}}</string>
+							<reference key="NSSuperview" ref="968759792"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="695942353">
+								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags2">4195328</int>
+								<string key="NSContents"/>
+								<object class="NSFont" key="NSSupport" id="388085141">
+									<string key="NSName">LucidaGrande</string>
+									<double key="NSSize">1.300000e+01</double>
+									<int key="NSfFlags">1044</int>
+								</object>
+								<reference key="NSControlView" ref="525062810"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<object class="NSColor" key="NSBackgroundColor" id="654903069">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textBackgroundColor</string>
+									<object class="NSColor" key="NSColor" id="794057780">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MQA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor" id="660787866">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">textColor</string>
+									<object class="NSColor" key="NSColor" id="563566452">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MAA</bytes>
+									</object>
+								</object>
+							</object>
+						</object>
+						<object class="NSTextField" id="880217974">
+							<reference key="NSNextResponder" ref="968759792"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{17, 297}, {58, 17}}</string>
+							<reference key="NSSuperview" ref="968759792"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="214445311">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">4194304</int>
+								<string key="NSContents">Subject:</string>
+								<reference key="NSSupport" ref="388085141"/>
+								<reference key="NSControlView" ref="880217974"/>
+								<object class="NSColor" key="NSBackgroundColor" id="365647164">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlColor</string>
+									<object class="NSColor" key="NSColor" id="1052346937">
+										<int key="NSColorSpace">3</int>
+										<bytes key="NSWhite">MC42NjY2NjY2OQA</bytes>
+									</object>
+								</object>
+								<object class="NSColor" key="NSTextColor" id="519542820">
+									<int key="NSColorSpace">6</int>
+									<string key="NSCatalogName">System</string>
+									<string key="NSColorName">controlTextColor</string>
+									<reference key="NSColor" ref="563566452"/>
+								</object>
+							</object>
+						</object>
+						<object class="NSTextField" id="303315230">
+							<reference key="NSNextResponder" ref="968759792"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{17, 270}, {66, 17}}</string>
+							<reference key="NSSuperview" ref="968759792"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="170880543">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">4194304</int>
+								<string key="NSContents">Message:</string>
+								<reference key="NSSupport" ref="388085141"/>
+								<reference key="NSControlView" ref="303315230"/>
+								<reference key="NSBackgroundColor" ref="365647164"/>
+								<reference key="NSTextColor" ref="519542820"/>
+							</object>
+						</object>
+						<object class="NSScrollView" id="21464669">
+							<reference key="NSNextResponder" ref="968759792"/>
+							<int key="NSvFlags">256</int>
+							<object class="NSMutableArray" key="NSSubviews">
+								<bool key="EncodedWithXMLCoder">YES</bool>
+								<object class="NSClipView" id="691145923">
+									<reference key="NSNextResponder" ref="21464669"/>
+									<int key="NSvFlags">2304</int>
+									<object class="NSMutableArray" key="NSSubviews">
+										<bool key="EncodedWithXMLCoder">YES</bool>
+										<object class="NSTextView" id="913314769">
+											<reference key="NSNextResponder" ref="691145923"/>
+											<int key="NSvFlags">2322</int>
+											<object class="NSMutableSet" key="NSDragTypes">
+												<bool key="EncodedWithXMLCoder">YES</bool>
+												<object class="NSMutableArray" key="set.sortedObjects">
+													<bool key="EncodedWithXMLCoder">YES</bool>
+													<string>Apple HTML pasteboard type</string>
+													<string>Apple PDF pasteboard type</string>
+													<string>Apple PICT pasteboard type</string>
+													<string>Apple PNG pasteboard type</string>
+													<string>Apple URL pasteboard type</string>
+													<string>CorePasteboardFlavorType 0x6D6F6F76</string>
+													<string>CorePasteboardFlavorType 0x75726C20</string>
+													<string>NSColor pasteboard type</string>
+													<string>NSFilenamesPboardType</string>
+													<string>NSStringPboardType</string>
+													<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+													<string>NeXT RTFD pasteboard type</string>
+													<string>NeXT Rich Text Format v1.0 pasteboard type</string>
+													<string>NeXT TIFF v4.0 pasteboard type</string>
+													<string>NeXT font pasteboard type</string>
+													<string>NeXT ruler pasteboard type</string>
+													<string>WebURLsWithTitlesPboardType</string>
+												</object>
+											</object>
+											<string key="NSFrameSize">{423, 14}</string>
+											<reference key="NSSuperview" ref="691145923"/>
+											<object class="NSTextContainer" key="NSTextContainer" id="811094908">
+												<object class="NSLayoutManager" key="NSLayoutManager">
+													<object class="NSTextStorage" key="NSTextStorage">
+														<object class="NSMutableString" key="NSString">
+															<characters key="NS.bytes"/>
+														</object>
+														<nil key="NSDelegate"/>
+													</object>
+													<object class="NSMutableArray" key="NSTextContainers">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<reference ref="811094908"/>
+													</object>
+													<int key="NSLMFlags">6</int>
+													<nil key="NSDelegate"/>
+												</object>
+												<reference key="NSTextView" ref="913314769"/>
+												<double key="NSWidth">4.230000e+02</double>
+												<int key="NSTCFlags">1</int>
+											</object>
+											<object class="NSTextViewSharedData" key="NSSharedData">
+												<int key="NSFlags">11239</int>
+												<reference key="NSBackgroundColor" ref="794057780"/>
+												<reference key="NSInsertionColor" ref="563566452"/>
+												<object class="NSDictionary" key="NSSelectedAttributes">
+													<bool key="EncodedWithXMLCoder">YES</bool>
+													<object class="NSMutableArray" key="dict.sortedKeys">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<string>NSBackgroundColor</string>
+														<string>NSColor</string>
+													</object>
+													<object class="NSMutableArray" key="dict.values">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<object class="NSColor">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">selectedTextBackgroundColor</string>
+															<reference key="NSColor" ref="1052346937"/>
+														</object>
+														<object class="NSColor">
+															<int key="NSColorSpace">6</int>
+															<string key="NSCatalogName">System</string>
+															<string key="NSColorName">selectedTextColor</string>
+															<reference key="NSColor" ref="563566452"/>
+														</object>
+													</object>
+												</object>
+												<nil key="NSMarkedAttributes"/>
+												<object class="NSDictionary" key="NSLinkAttributes">
+													<bool key="EncodedWithXMLCoder">YES</bool>
+													<object class="NSMutableArray" key="dict.sortedKeys">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<string>NSColor</string>
+														<string>NSUnderline</string>
+													</object>
+													<object class="NSMutableArray" key="dict.values">
+														<bool key="EncodedWithXMLCoder">YES</bool>
+														<object class="NSColor">
+															<int key="NSColorSpace">1</int>
+															<bytes key="NSRGB">MCAwIDEAA</bytes>
+														</object>
+														<integer value="1" id="9"/>
+													</object>
+												</object>
+												<nil key="NSDefaultParagraphStyle"/>
+											</object>
+											<int key="NSTVFlags">6</int>
+											<string key="NSMaxSize">{863, 1e+07}</string>
+											<string key="NSMinize">{83, 0}</string>
+											<nil key="NSDelegate"/>
+										</object>
+									</object>
+									<string key="NSFrame">{{1, 1}, {423, 200}}</string>
+									<reference key="NSSuperview" ref="21464669"/>
+									<reference key="NSNextKeyView" ref="913314769"/>
+									<reference key="NSDocView" ref="913314769"/>
+									<reference key="NSBGColor" ref="794057780"/>
+									<object class="NSCursor" key="NSCursor">
+										<string key="NSHotSpot">{4, -5}</string>
+										<int key="NSCursorType">1</int>
+									</object>
+									<int key="NScvFlags">4</int>
+								</object>
+								<object class="NSScroller" id="865287887">
+									<reference key="NSNextResponder" ref="21464669"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{424, 1}, {15, 200}}</string>
+									<reference key="NSSuperview" ref="21464669"/>
+									<reference key="NSTarget" ref="21464669"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSPercent">6.644518e-01</double>
+								</object>
+								<object class="NSScroller" id="582569348">
+									<reference key="NSNextResponder" ref="21464669"/>
+									<int key="NSvFlags">256</int>
+									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
+									<reference key="NSSuperview" ref="21464669"/>
+									<int key="NSsFlags">1</int>
+									<reference key="NSTarget" ref="21464669"/>
+									<string key="NSAction">_doScroller:</string>
+									<double key="NSCurValue">1.000000e+00</double>
+									<double key="NSPercent">9.456522e-01</double>
+								</object>
+							</object>
+							<string key="NSFrame">{{20, 60}, {440, 202}}</string>
+							<reference key="NSSuperview" ref="968759792"/>
+							<reference key="NSNextKeyView" ref="691145923"/>
+							<int key="NSsFlags">18</int>
+							<reference key="NSVScroller" ref="865287887"/>
+							<reference key="NSHScroller" ref="582569348"/>
+							<reference key="NSContentView" ref="691145923"/>
+						</object>
+						<object class="NSButton" id="476492581">
+							<reference key="NSNextResponder" ref="968759792"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{306, 12}, {82, 32}}</string>
+							<reference key="NSSuperview" ref="968759792"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="561506605">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Cancel</string>
+								<reference key="NSSupport" ref="388085141"/>
+								<reference key="NSControlView" ref="476492581"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="388085141"/>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSButton" id="116640207">
+							<reference key="NSNextResponder" ref="968759792"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{388, 12}, {78, 32}}</string>
+							<reference key="NSSuperview" ref="968759792"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="456522574">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">134217728</int>
+								<string key="NSContents">Send</string>
+								<reference key="NSSupport" ref="388085141"/>
+								<reference key="NSControlView" ref="116640207"/>
+								<int key="NSButtonFlags">-2038284033</int>
+								<int key="NSButtonFlags2">1</int>
+								<reference key="NSAlternateImage" ref="388085141"/>
+								<string key="NSAlternateContents"/>
+								<object class="NSMutableString" key="NSKeyEquivalent">
+									<characters key="NS.bytes"/>
+								</object>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
+						</object>
+						<object class="NSProgressIndicator" id="913548886">
+							<reference key="NSNextResponder" ref="968759792"/>
+							<int key="NSvFlags">1280</int>
+							<object class="NSPSMatrix" key="NSDrawMatrix"/>
+							<string key="NSFrame">{{444, 340}, {16, 16}}</string>
+							<reference key="NSSuperview" ref="968759792"/>
+							<int key="NSpiFlags">20746</int>
+							<double key="NSMaxValue">1.000000e+02</double>
+						</object>
+						<object class="NSTextField" id="445093303">
+							<reference key="NSNextResponder" ref="968759792"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{80, 337}, {356, 22}}</string>
+							<reference key="NSSuperview" ref="968759792"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="550536259">
+								<int key="NSCellFlags">-1804468671</int>
+								<int key="NSCellFlags2">272630784</int>
+								<string key="NSContents"/>
+								<reference key="NSSupport" ref="388085141"/>
+								<reference key="NSControlView" ref="445093303"/>
+								<bool key="NSDrawsBackground">YES</bool>
+								<reference key="NSBackgroundColor" ref="654903069"/>
+								<reference key="NSTextColor" ref="660787866"/>
+							</object>
+						</object>
+						<object class="NSTextField" id="554741613">
+							<reference key="NSNextResponder" ref="968759792"/>
+							<int key="NSvFlags">256</int>
+							<string key="NSFrame">{{17, 339}, {71, 17}}</string>
+							<reference key="NSSuperview" ref="968759792"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSTextFieldCell" key="NSCell" id="633871253">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">272629760</int>
+								<string key="NSContents">Email:</string>
+								<reference key="NSSupport" ref="388085141"/>
+								<reference key="NSControlView" ref="554741613"/>
+								<reference key="NSBackgroundColor" ref="365647164"/>
+								<reference key="NSTextColor" ref="519542820"/>
+							</object>
+						</object>
+					</object>
+					<string key="NSFrameSize">{480, 376}</string>
+					<reference key="NSSuperview"/>
+				</object>
+				<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
+				<string key="NSMinSize">{213, 129}</string>
+				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+			</object>
+		</object>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<object class="NSMutableArray" key="connectionRecords">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">initialFirstResponder</string>
+						<reference key="source" ref="90214653"/>
+						<reference key="destination" ref="445093303"/>
+					</object>
+					<int key="connectionID">23</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="476492581"/>
+						<reference key="destination" ref="116640207"/>
+					</object>
+					<int key="connectionID">24</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="21464669"/>
+						<reference key="destination" ref="476492581"/>
+					</object>
+					<int key="connectionID">26</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="116640207"/>
+						<reference key="destination" ref="445093303"/>
+					</object>
+					<int key="connectionID">28</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="525062810"/>
+						<reference key="destination" ref="913314769"/>
+					</object>
+					<int key="connectionID">30</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">nextKeyView</string>
+						<reference key="source" ref="445093303"/>
+						<reference key="destination" ref="525062810"/>
+					</object>
+					<int key="connectionID">33</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">subjectView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="525062810"/>
+					</object>
+					<int key="connectionID">36</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">fromView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="445093303"/>
+					</object>
+					<int key="connectionID">37</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">messageView</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="913314769"/>
+					</object>
+					<int key="connectionID">38</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">sendingIndicator</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="913548886"/>
+					</object>
+					<int key="connectionID">39</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">sendFeedback:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="116640207"/>
+					</object>
+					<int key="connectionID">40</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">cancel:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="476492581"/>
+					</object>
+					<int key="connectionID">41</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">window</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="90214653"/>
+					</object>
+					<int key="connectionID">42</int>
+				</object>
+			</object>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<object class="NSArray" key="orderedObjects">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<object class="NSArray" key="object" id="1002">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+						</object>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="1001"/>
+						<reference key="parent" ref="1002"/>
+						<string type="base64-UTF8" key="objectName">RmlsZSdzIE93bmVyA</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="1003"/>
+						<reference key="parent" ref="1002"/>
+						<string key="objectName">First Responder</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-3</int>
+						<reference key="object" ref="1004"/>
+						<reference key="parent" ref="1002"/>
+						<string key="objectName">Application</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="90214653"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="968759792"/>
+						</object>
+						<reference key="parent" ref="1002"/>
+						<string key="objectName">FeedbackWindow</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">3</int>
+						<reference key="object" ref="968759792"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="554741613"/>
+							<reference ref="445093303"/>
+							<reference ref="476492581"/>
+							<reference ref="303315230"/>
+							<reference ref="880217974"/>
+							<reference ref="116640207"/>
+							<reference ref="525062810"/>
+							<reference ref="21464669"/>
+							<reference ref="913548886"/>
+						</object>
+						<reference key="parent" ref="90214653"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">4</int>
+						<reference key="object" ref="554741613"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="633871253"/>
+						</object>
+						<reference key="parent" ref="968759792"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">5</int>
+						<reference key="object" ref="445093303"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="550536259"/>
+						</object>
+						<reference key="parent" ref="968759792"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">6</int>
+						<reference key="object" ref="476492581"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="561506605"/>
+						</object>
+						<reference key="parent" ref="968759792"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">7</int>
+						<reference key="object" ref="303315230"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="170880543"/>
+						</object>
+						<reference key="parent" ref="968759792"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">8</int>
+						<reference key="object" ref="880217974"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="214445311"/>
+						</object>
+						<reference key="parent" ref="968759792"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">9</int>
+						<reference key="object" ref="116640207"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="456522574"/>
+						</object>
+						<reference key="parent" ref="968759792"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">10</int>
+						<reference key="object" ref="525062810"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="695942353"/>
+						</object>
+						<reference key="parent" ref="968759792"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">11</int>
+						<reference key="object" ref="21464669"/>
+						<object class="NSMutableArray" key="children">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<reference ref="582569348"/>
+							<reference ref="865287887"/>
+							<reference ref="913314769"/>
+						</object>
+						<reference key="parent" ref="968759792"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">12</int>
+						<reference key="object" ref="913548886"/>
+						<reference key="parent" ref="968759792"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">13</int>
+						<reference key="object" ref="582569348"/>
+						<reference key="parent" ref="21464669"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">14</int>
+						<reference key="object" ref="865287887"/>
+						<reference key="parent" ref="21464669"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">15</int>
+						<reference key="object" ref="913314769"/>
+						<reference key="parent" ref="21464669"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">16</int>
+						<reference key="object" ref="695942353"/>
+						<reference key="parent" ref="525062810"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">17</int>
+						<reference key="object" ref="456522574"/>
+						<reference key="parent" ref="116640207"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">18</int>
+						<reference key="object" ref="214445311"/>
+						<reference key="parent" ref="880217974"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">19</int>
+						<reference key="object" ref="170880543"/>
+						<reference key="parent" ref="303315230"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">20</int>
+						<reference key="object" ref="561506605"/>
+						<reference key="parent" ref="476492581"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">21</int>
+						<reference key="object" ref="550536259"/>
+						<reference key="parent" ref="445093303"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">22</int>
+						<reference key="object" ref="633871253"/>
+						<reference key="parent" ref="554741613"/>
+					</object>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="flattenedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSMutableArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>-1.IBPluginDependency</string>
+					<string>-2.IBPluginDependency</string>
+					<string>-3.IBPluginDependency</string>
+					<string>1.IBEditorWindowLastContentRect</string>
+					<string>1.IBWindowTemplateEditedContentRect</string>
+					<string>1.ImportedFromIB2</string>
+					<string>1.editorWindowContentRectSynchronizationRect</string>
+					<string>1.windowTemplate.hasMaxSize</string>
+					<string>1.windowTemplate.hasMinSize</string>
+					<string>1.windowTemplate.maxSize</string>
+					<string>1.windowTemplate.minSize</string>
+					<string>10.IBPluginDependency</string>
+					<string>10.ImportedFromIB2</string>
+					<string>11.IBPluginDependency</string>
+					<string>11.ImportedFromIB2</string>
+					<string>12.IBPluginDependency</string>
+					<string>12.ImportedFromIB2</string>
+					<string>13.IBPluginDependency</string>
+					<string>13.ImportedFromIB2</string>
+					<string>14.IBPluginDependency</string>
+					<string>14.ImportedFromIB2</string>
+					<string>15.IBPluginDependency</string>
+					<string>15.ImportedFromIB2</string>
+					<string>16.IBPluginDependency</string>
+					<string>16.ImportedFromIB2</string>
+					<string>17.IBPluginDependency</string>
+					<string>17.ImportedFromIB2</string>
+					<string>18.IBPluginDependency</string>
+					<string>18.ImportedFromIB2</string>
+					<string>19.IBPluginDependency</string>
+					<string>19.ImportedFromIB2</string>
+					<string>20.IBPluginDependency</string>
+					<string>20.ImportedFromIB2</string>
+					<string>21.IBPluginDependency</string>
+					<string>21.ImportedFromIB2</string>
+					<string>22.IBPluginDependency</string>
+					<string>22.ImportedFromIB2</string>
+					<string>3.IBPluginDependency</string>
+					<string>3.ImportedFromIB2</string>
+					<string>4.IBPluginDependency</string>
+					<string>4.ImportedFromIB2</string>
+					<string>5.IBPluginDependency</string>
+					<string>5.ImportedFromIB2</string>
+					<string>6.IBPluginDependency</string>
+					<string>6.ImportedFromIB2</string>
+					<string>7.IBPluginDependency</string>
+					<string>7.ImportedFromIB2</string>
+					<string>8.IBPluginDependency</string>
+					<string>8.ImportedFromIB2</string>
+					<string>9.IBPluginDependency</string>
+					<string>9.ImportedFromIB2</string>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<string>com.apple.InterfaceBuilderKit</string>
+					<string>com.apple.InterfaceBuilderKit</string>
+					<string>{{124, 381}, {480, 376}}</string>
+					<string>{{124, 381}, {480, 376}}</string>
+					<reference ref="9"/>
+					<string>{{139, 290}, {480, 376}}</string>
+					<integer value="0"/>
+					<reference ref="9"/>
+					<string>{3.40282e+38, 3.40282e+38}</string>
+					<string>{213, 107}</string>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+					<reference ref="9"/>
+				</object>
+			</object>
+			<object class="NSMutableDictionary" key="unlocalizedProperties">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="activeLocalization"/>
+			<object class="NSMutableDictionary" key="localizations">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="NSArray" key="dict.sortedKeys">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+				<object class="NSMutableArray" key="dict.values">
+					<bool key="EncodedWithXMLCoder">YES</bool>
+				</object>
+			</object>
+			<nil key="sourceID"/>
+			<int key="maxID">42</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<bool key="EncodedWithXMLCoder">YES</bool>
+				<object class="IBPartialClassDescription">
+					<string key="className">FeedbackController</string>
+					<string key="superclassName">NSWindowController</string>
+					<object class="NSMutableDictionary" key="actions">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>cancel:</string>
+							<string>sendFeedback:</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>id</string>
+							<string>id</string>
+						</object>
+					</object>
+					<object class="NSMutableDictionary" key="outlets">
+						<bool key="EncodedWithXMLCoder">YES</bool>
+						<object class="NSMutableArray" key="dict.sortedKeys">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>fromView</string>
+							<string>messageView</string>
+							<string>sendingIndicator</string>
+							<string>subjectView</string>
+						</object>
+						<object class="NSMutableArray" key="dict.values">
+							<bool key="EncodedWithXMLCoder">YES</bool>
+							<string>NSTextField</string>
+							<string>NSTextView</string>
+							<string>NSProgressIndicator</string>
+							<string>NSTextField</string>
+						</object>
+					</object>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">Feedback/FeedbackController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">ThirdParty/AppleRemote/AppleRemote.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">ThirdParty/GCWindowMenu/GCOneShotEffectTimer.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSObject</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">ThirdParty/NDHotKeys/NDHotKeyEvent.h</string>
+					</object>
+				</object>
+			</object>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.LastKnownRelativeProjectPath">../Cog.xcodeproj</string>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+	</data>
+</archive>
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 9051967d5..c8056d843 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -10,8 +10,8 @@
 			<bool key="EncodedWithXMLCoder">YES</bool>
 			<integer value="21"/>
 			<integer value="2234"/>
+			<integer value="57"/>
 			<integer value="1063"/>
-			<integer value="29"/>
 		</object>
 		<object class="NSArray" key="IBDocument.PluginDependencies">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -99,7 +99,7 @@
 										<reference key="NSControlView" ref="753327466"/>
 										<bool key="NSDrawsBackground">YES</bool>
 										<int key="NSTextBezelStyle">1</int>
-										<object class="NSColor" key="NSBackgroundColor" id="308735910">
+										<object class="NSColor" key="NSBackgroundColor">
 											<int key="NSColorSpace">6</int>
 											<string key="NSCatalogName">System</string>
 											<string key="NSColorName">textBackgroundColor</string>
@@ -2842,298 +2842,6 @@ OQA</bytes>
 			<object class="NSCustomObject" id="558455632">
 				<string key="NSClassName">AppController</string>
 			</object>
-			<object class="NSWindowTemplate" id="449568657">
-				<int key="NSWindowStyleMask">3</int>
-				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{168, 357}, {480, 376}}</string>
-				<int key="NSWTFlags">1886912512</int>
-				<string key="NSWindowTitle">Send Feedback</string>
-				<string key="NSWindowClass">NSWindow</string>
-				<object class="NSMutableString" key="NSViewClass">
-					<characters key="NS.bytes">View</characters>
-				</object>
-				<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
-				<string key="NSWindowContentMinSize">{213, 107}</string>
-				<object class="NSView" key="NSWindowView" id="1001800056">
-					<nil key="NSNextResponder"/>
-					<int key="NSvFlags">256</int>
-					<object class="NSMutableArray" key="NSSubviews">
-						<bool key="EncodedWithXMLCoder">YES</bool>
-						<object class="NSTextField" id="40479361">
-							<reference key="NSNextResponder" ref="1001800056"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{80, 295}, {356, 22}}</string>
-							<reference key="NSSuperview" ref="1001800056"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="813933535">
-								<int key="NSCellFlags">-1804468671</int>
-								<int key="NSCellFlags2">4195328</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="854063545"/>
-								<reference key="NSControlView" ref="40479361"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="308735910"/>
-								<object class="NSColor" key="NSTextColor" id="205164227">
-									<int key="NSColorSpace">6</int>
-									<string key="NSCatalogName">System</string>
-									<string key="NSColorName">textColor</string>
-									<reference key="NSColor" ref="44532440"/>
-								</object>
-							</object>
-						</object>
-						<object class="NSTextField" id="895896681">
-							<reference key="NSNextResponder" ref="1001800056"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{17, 297}, {58, 17}}</string>
-							<reference key="NSSuperview" ref="1001800056"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="342443102">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">4194304</int>
-								<string key="NSContents">Subject:</string>
-								<reference key="NSSupport" ref="854063545"/>
-								<reference key="NSControlView" ref="895896681"/>
-								<reference key="NSBackgroundColor" ref="53746901"/>
-								<reference key="NSTextColor" ref="173361739"/>
-							</object>
-						</object>
-						<object class="NSTextField" id="995942868">
-							<reference key="NSNextResponder" ref="1001800056"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{17, 270}, {66, 17}}</string>
-							<reference key="NSSuperview" ref="1001800056"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="15110847">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">4194304</int>
-								<string key="NSContents">Message:</string>
-								<reference key="NSSupport" ref="854063545"/>
-								<reference key="NSControlView" ref="995942868"/>
-								<reference key="NSBackgroundColor" ref="53746901"/>
-								<reference key="NSTextColor" ref="173361739"/>
-							</object>
-						</object>
-						<object class="NSScrollView" id="415052237">
-							<reference key="NSNextResponder" ref="1001800056"/>
-							<int key="NSvFlags">256</int>
-							<object class="NSMutableArray" key="NSSubviews">
-								<bool key="EncodedWithXMLCoder">YES</bool>
-								<object class="NSClipView" id="623580477">
-									<reference key="NSNextResponder" ref="415052237"/>
-									<int key="NSvFlags">2304</int>
-									<object class="NSMutableArray" key="NSSubviews">
-										<bool key="EncodedWithXMLCoder">YES</bool>
-										<object class="NSTextView" id="305812291">
-											<reference key="NSNextResponder" ref="623580477"/>
-											<int key="NSvFlags">2322</int>
-											<string key="NSFrameSize">{423, 14}</string>
-											<reference key="NSSuperview" ref="623580477"/>
-											<object class="NSTextContainer" key="NSTextContainer" id="770231230">
-												<object class="NSLayoutManager" key="NSLayoutManager">
-													<object class="NSTextStorage" key="NSTextStorage">
-														<object class="NSMutableString" key="NSString">
-															<characters key="NS.bytes"/>
-														</object>
-														<nil key="NSDelegate"/>
-													</object>
-													<object class="NSMutableArray" key="NSTextContainers">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<reference ref="770231230"/>
-													</object>
-													<int key="NSLMFlags">6</int>
-													<nil key="NSDelegate"/>
-												</object>
-												<reference key="NSTextView" ref="305812291"/>
-												<double key="NSWidth">4.230000e+02</double>
-												<int key="NSTCFlags">1</int>
-											</object>
-											<object class="NSTextViewSharedData" key="NSSharedData">
-												<int key="NSFlags">11239</int>
-												<reference key="NSBackgroundColor" ref="724840017"/>
-												<reference key="NSInsertionColor" ref="44532440"/>
-												<object class="NSDictionary" key="NSSelectedAttributes">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSMutableArray" key="dict.sortedKeys">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<string>NSBackgroundColor</string>
-														<string>NSColor</string>
-													</object>
-													<object class="NSMutableArray" key="dict.values">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSColor">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">selectedTextBackgroundColor</string>
-															<reference key="NSColor" ref="1057200304"/>
-														</object>
-														<object class="NSColor">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">selectedTextColor</string>
-															<reference key="NSColor" ref="44532440"/>
-														</object>
-													</object>
-												</object>
-												<nil key="NSMarkedAttributes"/>
-												<object class="NSDictionary" key="NSLinkAttributes">
-													<bool key="EncodedWithXMLCoder">YES</bool>
-													<object class="NSMutableArray" key="dict.sortedKeys">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<string>NSColor</string>
-														<string>NSUnderline</string>
-													</object>
-													<object class="NSMutableArray" key="dict.values">
-														<bool key="EncodedWithXMLCoder">YES</bool>
-														<object class="NSColor">
-															<int key="NSColorSpace">1</int>
-															<bytes key="NSRGB">MCAwIDEAA</bytes>
-														</object>
-														<reference ref="9"/>
-													</object>
-												</object>
-												<nil key="NSDefaultParagraphStyle"/>
-											</object>
-											<int key="NSTVFlags">6</int>
-											<string key="NSMaxSize">{863, 1e+07}</string>
-											<string key="NSMinize">{83, 0}</string>
-											<nil key="NSDelegate"/>
-										</object>
-									</object>
-									<string key="NSFrame">{{1, 1}, {423, 200}}</string>
-									<reference key="NSSuperview" ref="415052237"/>
-									<reference key="NSNextKeyView" ref="305812291"/>
-									<reference key="NSDocView" ref="305812291"/>
-									<reference key="NSBGColor" ref="724840017"/>
-									<object class="NSCursor" key="NSCursor">
-										<string key="NSHotSpot">{4, -5}</string>
-										<int key="NSCursorType">1</int>
-									</object>
-									<int key="NScvFlags">4</int>
-								</object>
-								<object class="NSScroller" id="915852998">
-									<reference key="NSNextResponder" ref="415052237"/>
-									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{424, 1}, {15, 200}}</string>
-									<reference key="NSSuperview" ref="415052237"/>
-									<reference key="NSTarget" ref="415052237"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">6.644518e-01</double>
-								</object>
-								<object class="NSScroller" id="37909877">
-									<reference key="NSNextResponder" ref="415052237"/>
-									<int key="NSvFlags">256</int>
-									<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
-									<reference key="NSSuperview" ref="415052237"/>
-									<int key="NSsFlags">1</int>
-									<reference key="NSTarget" ref="415052237"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSCurValue">1.000000e+00</double>
-									<double key="NSPercent">9.456522e-01</double>
-								</object>
-							</object>
-							<string key="NSFrame">{{20, 60}, {440, 202}}</string>
-							<reference key="NSSuperview" ref="1001800056"/>
-							<reference key="NSNextKeyView" ref="623580477"/>
-							<int key="NSsFlags">18</int>
-							<reference key="NSVScroller" ref="915852998"/>
-							<reference key="NSHScroller" ref="37909877"/>
-							<reference key="NSContentView" ref="623580477"/>
-						</object>
-						<object class="NSButton" id="112521020">
-							<reference key="NSNextResponder" ref="1001800056"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{306, 12}, {82, 32}}</string>
-							<reference key="NSSuperview" ref="1001800056"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="669831599">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Cancel</string>
-								<reference key="NSSupport" ref="854063545"/>
-								<reference key="NSControlView" ref="112521020"/>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="854063545"/>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-						<object class="NSButton" id="186535640">
-							<reference key="NSNextResponder" ref="1001800056"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{388, 12}, {78, 32}}</string>
-							<reference key="NSSuperview" ref="1001800056"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSButtonCell" key="NSCell" id="826220056">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">134217728</int>
-								<string key="NSContents">Send</string>
-								<reference key="NSSupport" ref="854063545"/>
-								<reference key="NSControlView" ref="186535640"/>
-								<int key="NSButtonFlags">-2038284033</int>
-								<int key="NSButtonFlags2">1</int>
-								<reference key="NSAlternateImage" ref="854063545"/>
-								<string key="NSAlternateContents"/>
-								<object class="NSMutableString" key="NSKeyEquivalent">
-									<characters key="NS.bytes"/>
-								</object>
-								<int key="NSPeriodicDelay">200</int>
-								<int key="NSPeriodicInterval">25</int>
-							</object>
-						</object>
-						<object class="NSProgressIndicator" id="327000104">
-							<reference key="NSNextResponder" ref="1001800056"/>
-							<int key="NSvFlags">1280</int>
-							<object class="NSPSMatrix" key="NSDrawMatrix"/>
-							<string key="NSFrame">{{444, 340}, {16, 16}}</string>
-							<reference key="NSSuperview" ref="1001800056"/>
-							<int key="NSpiFlags">20746</int>
-							<double key="NSMaxValue">1.000000e+02</double>
-						</object>
-						<object class="NSTextField" id="725319016">
-							<reference key="NSNextResponder" ref="1001800056"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{80, 337}, {356, 22}}</string>
-							<reference key="NSSuperview" ref="1001800056"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="498409428">
-								<int key="NSCellFlags">-1804468671</int>
-								<int key="NSCellFlags2">272630784</int>
-								<string key="NSContents"/>
-								<reference key="NSSupport" ref="854063545"/>
-								<reference key="NSControlView" ref="725319016"/>
-								<bool key="NSDrawsBackground">YES</bool>
-								<reference key="NSBackgroundColor" ref="308735910"/>
-								<reference key="NSTextColor" ref="205164227"/>
-							</object>
-						</object>
-						<object class="NSTextField" id="18339131">
-							<reference key="NSNextResponder" ref="1001800056"/>
-							<int key="NSvFlags">256</int>
-							<string key="NSFrame">{{17, 339}, {71, 17}}</string>
-							<reference key="NSSuperview" ref="1001800056"/>
-							<bool key="NSEnabled">YES</bool>
-							<object class="NSTextFieldCell" key="NSCell" id="301824130">
-								<int key="NSCellFlags">67239424</int>
-								<int key="NSCellFlags2">272629760</int>
-								<string key="NSContents">Email:</string>
-								<reference key="NSSupport" ref="854063545"/>
-								<reference key="NSControlView" ref="18339131"/>
-								<reference key="NSBackgroundColor" ref="53746901"/>
-								<reference key="NSTextColor" ref="173361739"/>
-							</object>
-						</object>
-					</object>
-					<string key="NSFrameSize">{480, 376}</string>
-				</object>
-				<string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
-				<string key="NSMinSize">{213, 129}</string>
-				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
-			</object>
 			<object class="NSWindowTemplate" id="391790185">
 				<int key="NSWindowStyleMask">3</int>
 				<int key="NSWindowBacking">2</int>
@@ -3261,9 +2969,6 @@ OQA</bytes>
 				<string key="NSMinSize">{213, 129}</string>
 				<string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
 			</object>
-			<object class="NSCustomObject" id="1001811398">
-				<string key="NSClassName">FeedbackController</string>
-			</object>
 			<object class="NSMenu" id="259830052">
 				<string key="NSTitle">Menu</string>
 				<object class="NSMutableArray" key="NSMenuItems">
@@ -3618,6 +3323,9 @@ OQA</bytes>
 			<object class="NSCustomObject" id="895277152">
 				<string key="NSClassName">InfoWindowController</string>
 			</object>
+			<object class="NSCustomObject" id="242543650">
+				<string key="NSClassName">FeedbackController</string>
+			</object>
 		</object>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<object class="NSMutableArray" key="connectionRecords">
@@ -3734,118 +3442,6 @@ OQA</bytes>
 					</object>
 					<int key="connectionID">262</int>
 				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nextKeyView</string>
-						<reference key="source" ref="40479361"/>
-						<reference key="destination" ref="305812291"/>
-					</object>
-					<int key="connectionID">279</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">feedbackWindow</string>
-						<reference key="source" ref="1001811398"/>
-						<reference key="destination" ref="449568657"/>
-					</object>
-					<int key="connectionID">294</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">messageView</string>
-						<reference key="source" ref="1001811398"/>
-						<reference key="destination" ref="305812291"/>
-					</object>
-					<int key="connectionID">295</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">subjectView</string>
-						<reference key="source" ref="1001811398"/>
-						<reference key="destination" ref="40479361"/>
-					</object>
-					<int key="connectionID">296</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">sendingIndicator</string>
-						<reference key="source" ref="1001811398"/>
-						<reference key="destination" ref="327000104"/>
-					</object>
-					<int key="connectionID">297</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">sendFeedback:</string>
-						<reference key="source" ref="1001811398"/>
-						<reference key="destination" ref="186535640"/>
-					</object>
-					<int key="connectionID">298</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">cancel:</string>
-						<reference key="source" ref="1001811398"/>
-						<reference key="destination" ref="112521020"/>
-					</object>
-					<int key="connectionID">299</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBActionConnection" key="connection">
-						<string key="label">openFeedbackWindow:</string>
-						<reference key="source" ref="1001811398"/>
-						<reference key="destination" ref="296921596"/>
-					</object>
-					<int key="connectionID">305</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">fromView</string>
-						<reference key="source" ref="1001811398"/>
-						<reference key="destination" ref="725319016"/>
-					</object>
-					<int key="connectionID">308</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">initialFirstResponder</string>
-						<reference key="source" ref="449568657"/>
-						<reference key="destination" ref="725319016"/>
-					</object>
-					<int key="connectionID">309</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nextKeyView</string>
-						<reference key="source" ref="725319016"/>
-						<reference key="destination" ref="40479361"/>
-					</object>
-					<int key="connectionID">310</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nextKeyView</string>
-						<reference key="source" ref="415052237"/>
-						<reference key="destination" ref="112521020"/>
-					</object>
-					<int key="connectionID">312</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nextKeyView</string>
-						<reference key="source" ref="112521020"/>
-						<reference key="destination" ref="186535640"/>
-					</object>
-					<int key="connectionID">313</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">nextKeyView</string>
-						<reference key="source" ref="186535640"/>
-						<reference key="destination" ref="725319016"/>
-					</object>
-					<int key="connectionID">314</int>
-				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">delegate</string>
@@ -6348,6 +5944,14 @@ OQA</bytes>
 					</object>
 					<int key="connectionID">2433</int>
 				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">showWindow:</string>
+						<reference key="source" ref="242543650"/>
+						<reference key="destination" ref="296921596"/>
+					</object>
+					<int key="connectionID">2436</int>
+				</object>
 			</object>
 			<object class="IBMutableOrderedSet" key="objectRecords">
 				<object class="NSArray" key="orderedObjects">
@@ -6900,162 +6504,6 @@ OQA</bytes>
 						<reference key="parent" ref="293114310"/>
 						<string key="objectName">AppController</string>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">268</int>
-						<reference key="object" ref="449568657"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="1001800056"/>
-						</object>
-						<reference key="parent" ref="293114310"/>
-						<string key="objectName">FeedbackWindow</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">269</int>
-						<reference key="object" ref="1001800056"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="327000104"/>
-							<reference ref="415052237"/>
-							<reference ref="40479361"/>
-							<reference ref="186535640"/>
-							<reference ref="895896681"/>
-							<reference ref="995942868"/>
-							<reference ref="112521020"/>
-							<reference ref="725319016"/>
-							<reference ref="18339131"/>
-						</object>
-						<reference key="parent" ref="449568657"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">270</int>
-						<reference key="object" ref="327000104"/>
-						<reference key="parent" ref="1001800056"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">271</int>
-						<reference key="object" ref="415052237"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="305812291"/>
-							<reference ref="915852998"/>
-							<reference ref="37909877"/>
-						</object>
-						<reference key="parent" ref="1001800056"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">272</int>
-						<reference key="object" ref="305812291"/>
-						<reference key="parent" ref="415052237"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1518</int>
-						<reference key="object" ref="915852998"/>
-						<reference key="parent" ref="415052237"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1519</int>
-						<reference key="object" ref="37909877"/>
-						<reference key="parent" ref="415052237"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">273</int>
-						<reference key="object" ref="40479361"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="813933535"/>
-						</object>
-						<reference key="parent" ref="1001800056"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1486</int>
-						<reference key="object" ref="813933535"/>
-						<reference key="parent" ref="40479361"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">274</int>
-						<reference key="object" ref="186535640"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="826220056"/>
-						</object>
-						<reference key="parent" ref="1001800056"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1487</int>
-						<reference key="object" ref="826220056"/>
-						<reference key="parent" ref="186535640"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">275</int>
-						<reference key="object" ref="895896681"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="342443102"/>
-						</object>
-						<reference key="parent" ref="1001800056"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1488</int>
-						<reference key="object" ref="342443102"/>
-						<reference key="parent" ref="895896681"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">276</int>
-						<reference key="object" ref="995942868"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="15110847"/>
-						</object>
-						<reference key="parent" ref="1001800056"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1489</int>
-						<reference key="object" ref="15110847"/>
-						<reference key="parent" ref="995942868"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">277</int>
-						<reference key="object" ref="112521020"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="669831599"/>
-						</object>
-						<reference key="parent" ref="1001800056"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1490</int>
-						<reference key="object" ref="669831599"/>
-						<reference key="parent" ref="112521020"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">306</int>
-						<reference key="object" ref="725319016"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="498409428"/>
-						</object>
-						<reference key="parent" ref="1001800056"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1491</int>
-						<reference key="object" ref="498409428"/>
-						<reference key="parent" ref="725319016"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">307</int>
-						<reference key="object" ref="18339131"/>
-						<object class="NSMutableArray" key="children">
-							<bool key="EncodedWithXMLCoder">YES</bool>
-							<reference ref="301824130"/>
-						</object>
-						<reference key="parent" ref="1001800056"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1492</int>
-						<reference key="object" ref="301824130"/>
-						<reference key="parent" ref="18339131"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">280</int>
 						<reference key="object" ref="391790185"/>
@@ -7140,12 +6588,6 @@ OQA</bytes>
 						<reference key="object" ref="1066199654"/>
 						<reference key="parent" ref="286970761"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">288</int>
-						<reference key="object" ref="1001811398"/>
-						<reference key="parent" ref="293114310"/>
-						<string key="objectName">FeedbackController</string>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">513</int>
 						<reference key="object" ref="259830052"/>
@@ -8316,6 +7758,11 @@ OQA</bytes>
 						<reference key="object" ref="541859327"/>
 						<reference key="parent" ref="2022"/>
 					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">2434</int>
+						<reference key="object" ref="242543650"/>
+						<reference key="parent" ref="293114310"/>
+					</object>
 				</object>
 			</object>
 			<object class="NSMutableDictionary" key="flattenedProperties">
@@ -8417,22 +7864,8 @@ OQA</bytes>
 					<string>1454.ImportedFromIB2</string>
 					<string>1473.IBPluginDependency</string>
 					<string>1473.ImportedFromIB2</string>
-					<string>1486.IBPluginDependency</string>
-					<string>1486.ImportedFromIB2</string>
-					<string>1487.IBPluginDependency</string>
-					<string>1487.ImportedFromIB2</string>
-					<string>1488.IBPluginDependency</string>
-					<string>1488.ImportedFromIB2</string>
-					<string>1489.IBPluginDependency</string>
-					<string>1489.ImportedFromIB2</string>
 					<string>149.IBPluginDependency</string>
 					<string>149.ImportedFromIB2</string>
-					<string>1490.IBPluginDependency</string>
-					<string>1490.ImportedFromIB2</string>
-					<string>1491.IBPluginDependency</string>
-					<string>1491.ImportedFromIB2</string>
-					<string>1492.IBPluginDependency</string>
-					<string>1492.ImportedFromIB2</string>
 					<string>1493.IBPluginDependency</string>
 					<string>1493.ImportedFromIB2</string>
 					<string>1494.IBPluginDependency</string>
@@ -8466,10 +7899,6 @@ OQA</bytes>
 					<string>1517.CustomClassName</string>
 					<string>1517.IBPluginDependency</string>
 					<string>1517.ImportedFromIB2</string>
-					<string>1518.IBPluginDependency</string>
-					<string>1518.ImportedFromIB2</string>
-					<string>1519.IBPluginDependency</string>
-					<string>1519.ImportedFromIB2</string>
 					<string>1523.IBEditorWindowLastContentRect</string>
 					<string>1523.IBPluginDependency</string>
 					<string>1523.ImportedFromIB2</string>
@@ -8731,32 +8160,7 @@ OQA</bytes>
 					<string>2430.ImportedFromIB2</string>
 					<string>2431.IBPluginDependency</string>
 					<string>2431.ImportedFromIB2</string>
-					<string>268.IBEditorWindowLastContentRect</string>
-					<string>268.IBWindowTemplateEditedContentRect</string>
-					<string>268.ImportedFromIB2</string>
-					<string>268.editorWindowContentRectSynchronizationRect</string>
-					<string>268.windowTemplate.hasMaxSize</string>
-					<string>268.windowTemplate.hasMinSize</string>
-					<string>268.windowTemplate.maxSize</string>
-					<string>268.windowTemplate.minSize</string>
-					<string>269.IBPluginDependency</string>
-					<string>269.ImportedFromIB2</string>
-					<string>270.IBPluginDependency</string>
-					<string>270.ImportedFromIB2</string>
-					<string>271.IBPluginDependency</string>
-					<string>271.ImportedFromIB2</string>
-					<string>272.IBPluginDependency</string>
-					<string>272.ImportedFromIB2</string>
-					<string>273.IBPluginDependency</string>
-					<string>273.ImportedFromIB2</string>
-					<string>274.IBPluginDependency</string>
-					<string>274.ImportedFromIB2</string>
-					<string>275.IBPluginDependency</string>
-					<string>275.ImportedFromIB2</string>
-					<string>276.IBPluginDependency</string>
-					<string>276.ImportedFromIB2</string>
-					<string>277.IBPluginDependency</string>
-					<string>277.ImportedFromIB2</string>
+					<string>2434.IBPluginDependency</string>
 					<string>280.ImportedFromIB2</string>
 					<string>280.windowTemplate.hasMaxSize</string>
 					<string>280.windowTemplate.hasMinSize</string>
@@ -8774,8 +8178,6 @@ OQA</bytes>
 					<string>285.ImportedFromIB2</string>
 					<string>286.IBPluginDependency</string>
 					<string>286.ImportedFromIB2</string>
-					<string>288.IBPluginDependency</string>
-					<string>288.ImportedFromIB2</string>
 					<string>29.IBEditorWindowLastContentRect</string>
 					<string>29.IBPluginDependency</string>
 					<string>29.ImportedFromIB2</string>
@@ -8784,10 +8186,6 @@ OQA</bytes>
 					<string>302.ImportedFromIB2</string>
 					<string>303.IBPluginDependency</string>
 					<string>303.ImportedFromIB2</string>
-					<string>306.IBPluginDependency</string>
-					<string>306.ImportedFromIB2</string>
-					<string>307.IBPluginDependency</string>
-					<string>307.ImportedFromIB2</string>
 					<string>391.IBPluginDependency</string>
 					<string>391.ImportedFromIB2</string>
 					<string>418.IBPluginDependency</string>
@@ -9002,27 +8400,9 @@ OQA</bytes>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>PlaylistHeaderView</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>{{377, 973}, {617, 0}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
@@ -9284,33 +8664,8 @@ OQA</bytes>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{314, 416}, {480, 376}}</string>
-					<string>{{314, 416}, {480, 376}}</string>
-					<reference ref="9"/>
-					<string>{{139, 290}, {480, 376}}</string>
-					<reference ref="8"/>
-					<reference ref="9"/>
-					<string>{3.40282e+38, 3.40282e+38}</string>
-					<string>{213, 107}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<reference ref="9"/>
 					<reference ref="8"/>
 					<reference ref="9"/>
 					<string>{3.40282e+38, 3.40282e+38}</string>
@@ -9327,8 +8682,6 @@ OQA</bytes>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>{{576, 847}, {462, 20}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
@@ -9341,10 +8694,6 @@ OQA</bytes>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
-					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-					<reference ref="9"/>
 					<string>{{771, 554}, {222, 293}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
@@ -9375,7 +8724,7 @@ OQA</bytes>
 					<reference ref="9"/>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
-					<string>{{193, 473}, {232, 253}}</string>
+					<string>{{588, 594}, {232, 253}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<reference ref="9"/>
 					<string>{{124, 483}, {232, 253}}</string>
@@ -9447,7 +8796,7 @@ OQA</bytes>
 				</object>
 			</object>
 			<nil key="sourceID"/>
-			<int key="maxID">2433</int>
+			<int key="maxID">2436</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -9613,7 +8962,7 @@ OQA</bytes>
 				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FeedbackController</string>
-					<string key="superclassName">NSObject</string>
+					<string key="superclassName">NSWindowController</string>
 					<object class="NSMutableDictionary" key="actions">
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSMutableArray" key="dict.sortedKeys">
@@ -9633,7 +8982,6 @@ OQA</bytes>
 						<bool key="EncodedWithXMLCoder">YES</bool>
 						<object class="NSMutableArray" key="dict.sortedKeys">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>feedbackWindow</string>
 							<string>fromView</string>
 							<string>messageView</string>
 							<string>sendingIndicator</string>
@@ -9641,7 +8989,6 @@ OQA</bytes>
 						</object>
 						<object class="NSMutableArray" key="dict.values">
 							<bool key="EncodedWithXMLCoder">YES</bool>
-							<string>NSWindow</string>
 							<string>NSTextField</string>
 							<string>NSTextView</string>
 							<string>NSProgressIndicator</string>
@@ -9653,14 +9000,6 @@ OQA</bytes>
 						<string key="minorKey">Feedback/FeedbackController.h</string>
 					</object>
 				</object>
-				<object class="IBPartialClassDescription">
-					<string key="className">FeedbackController</string>
-					<string key="superclassName">NSObject</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBUserSource</string>
-						<string key="minorKey"/>
-					</object>
-				</object>
 				<object class="IBPartialClassDescription">
 					<string key="className">FileTreeViewController</string>
 					<string key="superclassName">SideViewController</string>
diff --git a/Feedback/FeedbackController.h b/Feedback/FeedbackController.h
index ec38c69bc..157adde7d 100644
--- a/Feedback/FeedbackController.h
+++ b/Feedback/FeedbackController.h
@@ -9,8 +9,7 @@
 #import <Cocoa/Cocoa.h>
 #import "FeedbackSocket.h"
 
-@interface FeedbackController : NSObject {
-	IBOutlet NSWindow* feedbackWindow;
+@interface FeedbackController : NSWindowController<FeedbackSocketDelegate> {
 	IBOutlet NSTextField* fromView;
 	IBOutlet NSTextField* subjectView;
 	IBOutlet NSTextView* messageView;
@@ -19,7 +18,6 @@
 	FeedbackSocket *feedbackSocket;
 }
 
-- (IBAction)openFeedbackWindow:(id)sender;
 - (IBAction)sendFeedback:(id)sender;
 - (IBAction)cancel:(id)sender;
 
diff --git a/Feedback/FeedbackController.m b/Feedback/FeedbackController.m
index 4aef38eee..b6a6e8674 100644
--- a/Feedback/FeedbackController.m
+++ b/Feedback/FeedbackController.m
@@ -11,25 +11,29 @@
 
 @implementation FeedbackController
 
-- (IBAction)openFeedbackWindow:(id)sender
+- (id)init
+{
+	return [super initWithWindowNibName:@"Feedback"];
+}
+
+- (IBAction)showWindow:(id)sender
 {	
 	[fromView setStringValue:@""];
 	[subjectView setStringValue:@""];
 	[messageView setString:@""];
 	
-	[feedbackWindow makeFirstResponder:fromView];
-	[feedbackWindow makeKeyAndOrderFront: sender];
+	[super showWindow:sender];
 }
 
 - (void)alertDidEnd:(NSAlert *)alert returnCode:(int)returnCode contextInfo:(void *)contextInfo
 {
 	if ([(NSNumber *)contextInfo boolValue]== YES)
 	{
-		[feedbackWindow close];
+		[[self window] close];
 	}
 }
 
-- (void)FeedbackErrorOccurred:(NSNotification *)aNotification
+- (void)feedbackDidNotSend:(FeedbackSocket *)feedback
 {
 	NSLog(@"Error sending feedback");
 	
@@ -39,10 +43,10 @@
 	[alert setMessageText:NSLocalizedString(@"FeedbackFailedMessageText", @"")];
 	[alert setInformativeText:NSLocalizedString(@"FeedbackFailedInformativeText", @"")];
 	
-	[alert beginSheetModalForWindow:feedbackWindow modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:[NSNumber numberWithBool:NO]];
+	[alert beginSheetModalForWindow:[self window] modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:[NSNumber numberWithBool:NO]];
 }
 
-- (void)FeedbackSent:(NSNotification *)aNotification
+- (void)feedbackDidSend:(FeedbackSocket *)feedback
 {
 	[sendingIndicator stopAnimation:self];
 
@@ -50,7 +54,7 @@
 	[alert setMessageText:NSLocalizedString(@"FeedbackSuccessMessageText", @"")];
 	[alert setInformativeText:NSLocalizedString(@"FeedbackSuccessInformativeText", @"")];
 
-	[alert beginSheetModalForWindow:feedbackWindow modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:[NSNumber numberWithBool:YES]];
+	[alert beginSheetModalForWindow:[self window] modalDelegate:self didEndSelector:@selector(alertDidEnd:returnCode:contextInfo:) contextInfo:[NSNumber numberWithBool:YES]];
 }
 
 
@@ -69,7 +73,7 @@
 
 - (IBAction)cancel:(id)sender
 {
-	[feedbackWindow close];
+	[[self window] close];
 }
 
 @end
diff --git a/Feedback/FeedbackSocket.h b/Feedback/FeedbackSocket.h
index 99e0f38ec..679c8b3b5 100644
--- a/Feedback/FeedbackSocket.h
+++ b/Feedback/FeedbackSocket.h
@@ -8,6 +8,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+@protocol FeedbackSocketDelegate;
 
 @interface FeedbackSocket : NSObject {
 	NSString *from;
@@ -15,10 +16,10 @@
 	NSString *message;
 	NSString *version;
 	
-	id delegate;
+	id<FeedbackSocketDelegate> delegate;
 }
 
-- (void)setDelegate:(id)d;
+- (void)setDelegate:(id<FeedbackSocketDelegate>)d;
 - (void)sendFeedback: (NSString *)f subject:(NSString *)s message:(NSString *)m version:(NSString *)v;
 
 - (void)setFrom:(NSString *)f;
@@ -27,3 +28,10 @@
 - (void)setVersion:(NSString *)v;
 
 @end
+
+@protocol FeedbackSocketDelegate<NSObject>
+
+- (void)feedbackDidSend:(FeedbackSocket *)feedback;
+- (void)feedbackDidNotSend:(FeedbackSocket *)feedback;
+
+@end
diff --git a/Feedback/FeedbackSocket.m b/Feedback/FeedbackSocket.m
index 7d5d1968a..33994a663 100644
--- a/Feedback/FeedbackSocket.m
+++ b/Feedback/FeedbackSocket.m
@@ -8,10 +8,6 @@
 
 #import "FeedbackSocket.h"
 
-// NSNotifications
-NSString *FeedbackErrorOccurredNotification = @"FeedbackErrorOccurredNotification";
-NSString *FeedbackSentNotification = @"FeedbackSentNotification";
-
 @implementation FeedbackSocket
 
 NSString *encodeForURL(NSString *s)
@@ -72,36 +68,21 @@ NSString *encodeForURL(NSString *s)
 
 - (void)returnSuccess:(id)userInfo
 {
-    [[NSNotificationCenter defaultCenter] postNotificationName:FeedbackSentNotification object:self];
+    if ([delegate respondsToSelector:@selector(feedbackDidSend:)]) {
+		[delegate feedbackDidSend:self];
+	}
 }
 
 - (void)returnFailure:(id)userInfo
 {
-    [[NSNotificationCenter defaultCenter] postNotificationName:FeedbackErrorOccurredNotification object:self];
+    if ([delegate respondsToSelector:@selector(feedbackDidNotSend:)]) {
+		[delegate feedbackDidNotSend:self];
+	}
 }
 
--(void)setDelegate:(id)d
+-(void)setDelegate:(id<FeedbackSocketDelegate>)d
 {
-	NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
-	
-    if (delegate != nil) {
-        // Unregister with the notification center
-        [nc removeObserver:delegate name:FeedbackErrorOccurredNotification object:self];
-        [nc removeObserver:delegate name:FeedbackSentNotification object:self];
-        [delegate autorelease];
-    }
-    delegate = [d retain];
-    
-	// Register the new FeedbackNotification methods for the delegate
-    // Only register if the delegate implements it, though
-    if ([delegate respondsToSelector:@selector(FeedbackErrorOccurred:)])
-	{
-        [nc addObserver:delegate selector:@selector(FeedbackErrorOccurred:) name:FeedbackErrorOccurredNotification object:self];
-    }
-    if ([delegate respondsToSelector:@selector(FeedbackSent:)])
-	{
-        [nc addObserver:delegate selector:@selector(FeedbackSent:) name:FeedbackSentNotification object:self];
-    }
+    delegate = d;
 }