diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj
index 586b2614..805df7c7 100644
--- a/MacPass.xcodeproj/project.pbxproj
+++ b/MacPass.xcodeproj/project.pbxproj
@@ -1684,6 +1684,7 @@
 				4C5133861FA0C32C00C94C73 /* Accessory */,
 				4C4B7EF517A46815000234C7 /* Inspector */,
 				4C47D77718B37911002755E4 /* Preferences */,
+				4CD97D242591331B00E9C606 /* OTP */,
 				4CAAA8241D787B8B00CDE977 /* MPAutotypeBuilderViewController.h */,
 				4CAAA8251D787B8B00CDE977 /* MPAutotypeBuilderViewController.m */,
 				FA9FD32E1FB5EDD3003CEDD6 /* AutotypeBuilderView.xib */,
@@ -1741,9 +1742,6 @@
 				4C73B6EE215E64A7009787F7 /* MPWelcomeViewController.h */,
 				4C73B6EF215E64A7009787F7 /* MPWelcomeViewController.m */,
 				4C7F8B6A1A10B68400CCB83D /* WelcomeView.xib */,
-				4C356642258259AA00CAB95B /* MPTOTPSetupViewController.h */,
-				4C356643258259AA00CAB95B /* MPTOTPSetupViewController.m */,
-				4C356644258259AA00CAB95B /* MPTOTPSetupViewController.xib */,
 			);
 			name = "View Controller";
 			sourceTree = "<group>";
@@ -1774,6 +1772,16 @@
 			path = Databases;
 			sourceTree = "<group>";
 		};
+		4CD97D242591331B00E9C606 /* OTP */ = {
+			isa = PBXGroup;
+			children = (
+				4C356642258259AA00CAB95B /* MPTOTPSetupViewController.h */,
+				4C356643258259AA00CAB95B /* MPTOTPSetupViewController.m */,
+				4C356644258259AA00CAB95B /* MPTOTPSetupViewController.xib */,
+			);
+			name = OTP;
+			sourceTree = "<group>";
+		};
 		4CDB556616E29A8A00635918 /* Controls */ = {
 			isa = PBXGroup;
 			children = (
diff --git a/MacPass/EntryView.xib b/MacPass/EntryView.xib
index d6fcbc59..792b0846 100644
--- a/MacPass/EntryView.xib
+++ b/MacPass/EntryView.xib
@@ -1,39 +1,37 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="17506" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14490.70"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17506"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="MPEntryViewController">
             <connections>
                 <outlet property="entryTable" destination="55" id="111"/>
-                <outlet property="tableToTopConstraint" destination="683" id="844"/>
-                <outlet property="view" destination="336" id="395"/>
+                <outlet property="stackView" destination="HUE-DP-c7W" id="b3R-0D-n3B"/>
+                <outlet property="view" destination="HUE-DP-c7W" id="ufg-kX-8A8"/>
             </connections>
         </customObject>
-        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
-        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView translatesAutoresizingMaskIntoConstraints="NO" id="336">
-            <rect key="frame" x="0.0" y="0.0" width="694" height="594"/>
+        <stackView distribution="fill" orientation="vertical" alignment="leading" spacing="0.0" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" id="HUE-DP-c7W">
+            <rect key="frame" x="0.0" y="0.0" width="695" height="164"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
                 <scrollView focusRingType="none" borderType="none" autohidesScrollers="YES" horizontalLineScroll="19" horizontalPageScroll="10" verticalLineScroll="19" verticalPageScroll="10" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="54">
-                    <rect key="frame" x="0.0" y="0.0" width="694" height="595"/>
+                    <rect key="frame" x="0.0" y="0.0" width="695" height="164"/>
                     <clipView key="contentView" id="4tt-2K-SPF">
-                        <rect key="frame" x="0.0" y="0.0" width="694" height="595"/>
+                        <rect key="frame" x="0.0" y="0.0" width="695" height="164"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView verticalHuggingPriority="750" allowsExpansionToolTips="YES" columnAutoresizingStyle="lastColumnOnly" alternatingRowBackgroundColors="YES" rowSizeStyle="automatic" headerView="676" viewBased="YES" id="55" customClass="MPTableView">
-                                <rect key="frame" x="0.0" y="0.0" width="694" height="572"/>
-                                <autoresizingMask key="autoresizingMask"/>
+                                <rect key="frame" x="0.0" y="0.0" width="695" height="141"/>
+                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <size key="intercellSpacing" width="3" height="2"/>
                                 <color key="backgroundColor" name="controlBackgroundColor" catalog="System" colorSpace="catalog"/>
                                 <color key="gridColor" name="gridColor" catalog="System" colorSpace="catalog"/>
                                 <tableColumns>
                                     <tableColumn identifier="Group Column" width="104.609375" minWidth="40" maxWidth="3.4028234663852886e+38" id="117">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -49,7 +47,7 @@
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="270">
-                                                        <rect key="frame" x="1" y="0.0" width="103" height="17"/>
+                                                        <rect key="frame" x="1" y="1" width="103" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="271">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -70,7 +68,6 @@
                                     </tableColumn>
                                     <tableColumn identifier="Title Column" width="144.1171875" minWidth="40" maxWidth="3.4028234663852886e+38" id="119">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -119,7 +116,6 @@
                                     </tableColumn>
                                     <tableColumn identifier="Password Column" width="118.73046875" minWidth="10" maxWidth="3.4028234663852886e+38" id="232">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -135,7 +131,7 @@
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="429" customClass="NSSecureTextField">
-                                                        <rect key="frame" x="1" y="0.0" width="116" height="17"/>
+                                                        <rect key="frame" x="1" y="1" width="116" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="430">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -156,7 +152,6 @@
                                     </tableColumn>
                                     <tableColumn identifier="URL Column" width="113.18359375" minWidth="10" maxWidth="3.4028234663852886e+38" id="419">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -172,7 +167,7 @@
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="422">
-                                                        <rect key="frame" x="1" y="0.0" width="111" height="17"/>
+                                                        <rect key="frame" x="1" y="1" width="111" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="423">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -191,9 +186,8 @@
                                             </tableCellView>
                                         </prototypeCellViews>
                                     </tableColumn>
-                                    <tableColumn width="199" minWidth="10" maxWidth="3.4028234663852886e+38" id="614">
+                                    <tableColumn width="200" minWidth="10" maxWidth="3.4028234663852886e+38" id="614">
                                         <tableHeaderCell key="headerCell" lineBreakMode="truncatingTail" borderStyle="border" alignment="left">
-                                            <font key="font" metaFont="smallSystem"/>
                                             <color key="textColor" name="headerTextColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="headerColor" catalog="System" colorSpace="catalog"/>
                                         </tableHeaderCell>
@@ -205,11 +199,11 @@
                                         <tableColumnResizingMask key="resizingMask" resizeWithTable="YES" userResizable="YES"/>
                                         <prototypeCellViews>
                                             <tableCellView id="616">
-                                                <rect key="frame" x="493" y="1" width="199" height="17"/>
+                                                <rect key="frame" x="493" y="1" width="200" height="17"/>
                                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 <subviews>
                                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="617">
-                                                        <rect key="frame" x="1" y="0.0" width="197" height="17"/>
+                                                        <rect key="frame" x="1" y="1" width="198" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="618">
                                                             <font key="font" metaFont="system"/>
                                                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -241,19 +235,21 @@
                         <autoresizingMask key="autoresizingMask"/>
                     </scroller>
                     <tableHeaderView key="headerView" id="676">
-                        <rect key="frame" x="0.0" y="0.0" width="694" height="23"/>
+                        <rect key="frame" x="0.0" y="0.0" width="695" height="23"/>
                         <autoresizingMask key="autoresizingMask"/>
                     </tableHeaderView>
                 </scrollView>
             </subviews>
-            <constraints>
-                <constraint firstItem="54" firstAttribute="leading" secondItem="336" secondAttribute="leading" id="346"/>
-                <constraint firstItem="54" firstAttribute="trailing" secondItem="336" secondAttribute="trailing" id="348"/>
-                <constraint firstItem="54" firstAttribute="top" secondItem="336" secondAttribute="top" constant="-1" id="683"/>
-                <constraint firstAttribute="bottom" secondItem="54" secondAttribute="bottom" id="vfw-Ff-Ip8"/>
-            </constraints>
-            <point key="canvasLocation" x="-28" y="434"/>
-        </customView>
+            <visibilityPriorities>
+                <integer value="1000"/>
+            </visibilityPriorities>
+            <customSpacing>
+                <real value="3.4028234663852886e+38"/>
+            </customSpacing>
+            <point key="canvasLocation" x="-131" y="736"/>
+        </stackView>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
     </objects>
     <resources>
         <image name="NSActionTemplate" width="14" height="14"/>
diff --git a/MacPass/MPEntryViewController.m b/MacPass/MPEntryViewController.m
index 261cbf6a..0cec65ac 100644
--- a/MacPass/MPEntryViewController.m
+++ b/MacPass/MPEntryViewController.m
@@ -70,21 +70,16 @@ NSString *const _MPTableStringCellView = @"StringCell";
 NSString *const _MPTableSecurCellView = @"PasswordCell";
 
 @interface MPEntryViewController () {
-  BOOL _isDisplayingContextBar;
   BOOL _didUnlock;
 }
 
 @property (strong) MPContextBarViewController *contextBarViewController;
 @property (strong) NSArray *filteredEntries;
 
+@property (strong) IBOutlet NSStackView *stackView;
 @property (weak) IBOutlet NSTableView *entryTable;
 @property (assign) MPDisplayMode displayMode;
 
-
-/* Constraints */
-@property (strong) IBOutlet NSLayoutConstraint *tableToTopConstraint;
-@property (strong) NSLayoutConstraint *contextBarTopConstraint;
-
 @property (nonatomic, strong) MPEntryTableDataSource *dataSource;
 
 @end
@@ -98,7 +93,6 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
   self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
   if(self) {
-    _isDisplayingContextBar = NO;
     _displayMode = MPDisplayModeEntries;
     _entryArrayController = [[NSArrayController alloc] init];
     _dataSource = [[MPEntryTableDataSource alloc] init];
@@ -543,56 +537,14 @@ NSString *const _MPTableSecurCellView = @"PasswordCell";
 }
 
 - (void)_showContextBar {
-  if(_isDisplayingContextBar) {
-    return;
+  if(self.stackView.views.count == 1) {
+    [self.stackView insertArrangedSubview:self.contextBarViewController.view atIndex:0];
   }
-  _isDisplayingContextBar = YES;
-  if(!self.contextBarViewController.view.superview) {
-    [self.view addSubview:self.contextBarViewController.view];
-    NSView *contextBar = self.contextBarViewController.view;
-    NSView *scrollView = self.entryTable.enclosingScrollView;
-    NSDictionary *views = NSDictionaryOfVariableBindings(scrollView, contextBar);
-    
-    /* Pin to the left */
-    [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|[contextBar]|" options:0 metrics:nil views:views]];
-    /* Pin height and to top of entry table */
-    [self.view addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:[contextBar(==30)]-0-[scrollView]" options:0 metrics:nil views:views]];
-    /* Create the top constraint for the filter bar where we can change the constant instead of removing/adding constraints all the time */
-    self.contextBarTopConstraint = [NSLayoutConstraint constraintWithItem:contextBar
-                                                                attribute:NSLayoutAttributeTop
-                                                                relatedBy:NSLayoutRelationEqual
-                                                                   toItem:self.view
-                                                                attribute:NSLayoutAttributeTop
-                                                               multiplier:1
-                                                                 constant:-31];
-  }
-  /* Add the view for the first time */
-  [self.view removeConstraint:self.tableToTopConstraint];
-  [self.view addConstraint:self.contextBarTopConstraint];
-  [self.view layout];
-  self.contextBarTopConstraint.constant = 0;
-  
-  [NSAnimationContext runAnimationGroup:^(NSAnimationContext* context) {
-    context.duration = STATUS_BAR_ANIMATION_TIME;
-    context.allowsImplicitAnimation = YES;
-    [self.view layoutSubtreeIfNeeded];
-  } completionHandler:nil];
+  self.contextBarViewController.view.hidden = NO;
 }
 
 - (void)_hideContextBar {
-  if(!_isDisplayingContextBar) {
-    return; // nothing to do;
-  }
-  self.contextBarTopConstraint.constant = -31;
-  [self.view addConstraint:self.tableToTopConstraint];
-  
-  [NSAnimationContext runAnimationGroup:^(NSAnimationContext* context) {
-    context.duration = STATUS_BAR_ANIMATION_TIME;
-    context.allowsImplicitAnimation = YES;
-    [self.view layoutSubtreeIfNeeded];
-  } completionHandler:^{
-    self->_isDisplayingContextBar = NO;
-  }];
+  self.contextBarViewController.view.hidden = YES;
 }
 
 #pragma mark Validation
diff --git a/MacPass/MPTOTPSetupViewController.xib b/MacPass/MPTOTPSetupViewController.xib
index fc896846..a59a8aed 100644
--- a/MacPass/MPTOTPSetupViewController.xib
+++ b/MacPass/MPTOTPSetupViewController.xib
@@ -14,9 +14,176 @@
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
         <customView id="Hz6-mo-xeY">
-            <rect key="frame" x="0.0" y="0.0" width="496" height="534"/>
+            <rect key="frame" x="0.0" y="0.0" width="354" height="316"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-            <point key="canvasLocation" x="-198" y="53"/>
+            <subviews>
+                <stackView distribution="fill" orientation="vertical" alignment="centerX" spacing="20" horizontalStackHuggingPriority="249.99998474121094" verticalStackHuggingPriority="249.99998474121094" detachesHiddenViews="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ene-iL-JT3">
+                    <rect key="frame" x="20" y="106" width="314" height="190"/>
+                    <subviews>
+                        <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="yS5-M0-RSB">
+                            <rect key="frame" x="122" y="123" width="70" height="70"/>
+                            <constraints>
+                                <constraint firstAttribute="width" constant="64" id="EXM-vg-ehl"/>
+                                <constraint firstAttribute="height" constant="64" id="U2b-8Z-WPa"/>
+                            </constraints>
+                            <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" imageFrameStyle="grayBezel" id="BXB-xr-hqw"/>
+                        </imageView>
+                        <gridView xPlacement="leading" yPlacement="center" rowAlignment="firstBaseline" translatesAutoresizingMaskIntoConstraints="NO" id="4gl-4p-0WY">
+                            <rect key="frame" x="0.0" y="0.0" width="314" height="106"/>
+                            <constraints>
+                                <constraint firstItem="yiW-Wk-6YB" firstAttribute="leading" secondItem="4gl-4p-0WY" secondAttribute="leading" constant="9" id="jcX-sf-Qkm"/>
+                            </constraints>
+                            <rows>
+                                <gridRow id="GmF-7D-t30"/>
+                                <gridRow id="hS6-e9-JPg"/>
+                                <gridRow id="QY3-TF-Rbs"/>
+                                <gridRow id="0Jy-aF-Wst"/>
+                            </rows>
+                            <columns>
+                                <gridColumn xPlacement="trailing" id="Ar1-qh-iHT"/>
+                                <gridColumn id="Ecc-pj-MX9"/>
+                                <gridColumn id="aZO-dP-SsW"/>
+                            </columns>
+                            <gridCells>
+                                <gridCell row="GmF-7D-t30" column="Ar1-qh-iHT" id="Isd-CW-srQ">
+                                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e3u-QK-K24">
+                                        <rect key="frame" x="61" y="87" width="44" height="16"/>
+                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Secret" id="ufY-IN-5UY">
+                                            <font key="font" usesAppearanceFont="YES"/>
+                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                </gridCell>
+                                <gridCell row="GmF-7D-t30" column="Ecc-pj-MX9" id="Fpx-eQ-WAY">
+                                    <textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bt8-9X-91R">
+                                        <rect key="frame" x="109" y="85" width="100" height="21"/>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="N3a-bO-6va">
+                                            <font key="font" usesAppearanceFont="YES"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                </gridCell>
+                                <gridCell row="GmF-7D-t30" column="aZO-dP-SsW" id="ZXy-HZ-O3a"/>
+                                <gridCell row="hS6-e9-JPg" column="Ar1-qh-iHT" id="5hJ-4K-a2d">
+                                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yiW-Wk-6YB">
+                                        <rect key="frame" x="7" y="59" width="98" height="16"/>
+                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Hash Algorithm" id="g3s-fk-k9Q">
+                                            <font key="font" usesAppearanceFont="YES"/>
+                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                </gridCell>
+                                <gridCell row="hS6-e9-JPg" column="Ecc-pj-MX9" id="6MO-n5-2Cu">
+                                    <popUpButton key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="caF-Au-ey8">
+                                        <rect key="frame" x="107" y="53" width="95" height="25"/>
+                                        <popUpButtonCell key="cell" type="push" title="SHA-1" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="4Bi-z2-2Oz" id="Rxs-11-LRy">
+                                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="menu"/>
+                                            <menu key="menu" id="zev-8W-Uhl">
+                                                <items>
+                                                    <menuItem title="SHA-1" id="4Bi-z2-2Oz">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    </menuItem>
+                                                    <menuItem title="SHA-256" id="oW0-dE-qqs">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    </menuItem>
+                                                    <menuItem title="SHA-512" id="WC2-hF-FNN">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </popUpButtonCell>
+                                    </popUpButton>
+                                </gridCell>
+                                <gridCell row="hS6-e9-JPg" column="aZO-dP-SsW" id="56r-vv-PhT"/>
+                                <gridCell row="QY3-TF-Rbs" column="Ar1-qh-iHT" id="jL5-XH-KYZ">
+                                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JOR-bN-ZYC">
+                                        <rect key="frame" x="41" y="31" width="64" height="16"/>
+                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Time step" id="hbT-mm-dIn">
+                                            <font key="font" usesAppearanceFont="YES"/>
+                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                </gridCell>
+                                <gridCell row="QY3-TF-Rbs" column="Ecc-pj-MX9" xPlacement="fill" id="bvB-9m-g1U">
+                                    <textField key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="AdN-zI-C65">
+                                        <rect key="frame" x="109" y="29" width="100" height="21"/>
+                                        <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" borderStyle="bezel" drawsBackground="YES" id="bHO-kq-GUf">
+                                            <font key="font" usesAppearanceFont="YES"/>
+                                            <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                </gridCell>
+                                <gridCell row="QY3-TF-Rbs" column="aZO-dP-SsW" rowAlignment="none" id="oRW-3a-WxP">
+                                    <stepper key="contentView" horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="CgJ-Qt-NPu">
+                                        <rect key="frame" x="212" y="25" width="19" height="28"/>
+                                        <stepperCell key="cell" continuous="YES" alignment="left" maxValue="100" id="RPy-q9-wKy"/>
+                                    </stepper>
+                                </gridCell>
+                                <gridCell row="0Jy-aF-Wst" column="Ar1-qh-iHT" id="hWa-nU-LpX">
+                                    <textField key="contentView" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="z5V-Af-Kpa">
+                                        <rect key="frame" x="-2" y="3" width="107" height="16"/>
+                                        <textFieldCell key="cell" lineBreakMode="clipping" title="Number of Digits" id="iYF-F5-nMb">
+                                            <font key="font" usesAppearanceFont="YES"/>
+                                            <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                            <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                        </textFieldCell>
+                                    </textField>
+                                </gridCell>
+                                <gridCell row="0Jy-aF-Wst" column="Ecc-pj-MX9" id="gil-83-ris">
+                                    <popUpButton key="contentView" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="aa3-XV-Chc">
+                                        <rect key="frame" x="107" y="-3" width="53" height="25"/>
+                                        <popUpButtonCell key="cell" type="push" title="6" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="jz0-Sd-awx" id="rzY-5S-dIJ">
+                                            <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                            <font key="font" metaFont="menu"/>
+                                            <menu key="menu" id="XCv-uH-EcW">
+                                                <items>
+                                                    <menuItem title="6" id="jz0-Sd-awx">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    </menuItem>
+                                                    <menuItem title="7" id="hz5-72-opf">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    </menuItem>
+                                                    <menuItem title="8" id="IOL-0x-lVH">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    </menuItem>
+                                                    <menuItem title="9" id="O3K-NF-LJY">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    </menuItem>
+                                                    <menuItem title="10" id="7bj-IB-q5T">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </popUpButtonCell>
+                                    </popUpButton>
+                                </gridCell>
+                                <gridCell row="0Jy-aF-Wst" column="aZO-dP-SsW" id="V48-br-lpl"/>
+                            </gridCells>
+                        </gridView>
+                    </subviews>
+                    <visibilityPriorities>
+                        <integer value="1000"/>
+                        <integer value="1000"/>
+                    </visibilityPriorities>
+                    <customSpacing>
+                        <real value="3.4028234663852886e+38"/>
+                        <real value="3.4028234663852886e+38"/>
+                    </customSpacing>
+                </stackView>
+            </subviews>
+            <constraints>
+                <constraint firstItem="ene-iL-JT3" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" symbolic="YES" id="51M-r8-4kc"/>
+                <constraint firstItem="ene-iL-JT3" firstAttribute="top" secondItem="Hz6-mo-xeY" secondAttribute="top" constant="20" symbolic="YES" id="HNb-e5-VJF"/>
+                <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="ene-iL-JT3" secondAttribute="bottom" constant="20" symbolic="YES" id="OYl-ml-l0m"/>
+                <constraint firstAttribute="trailing" secondItem="ene-iL-JT3" secondAttribute="trailing" constant="20" symbolic="YES" id="sKp-EZ-uRv"/>
+            </constraints>
+            <point key="canvasLocation" x="-407" y="-77"/>
         </customView>
     </objects>
 </document>