diff --git a/ui/Base.lproj/ExportPasswordWindow.xib b/ui/Base.lproj/ExportPasswordWindow.xib
index 1749414..827f00a 100644
--- a/ui/Base.lproj/ExportPasswordWindow.xib
+++ b/ui/Base.lproj/ExportPasswordWindow.xib
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -9,12 +9,12 @@
             <connections>
                 <outlet property="errorContainer" destination="ty1-sj-tT6" id="eEy-Cr-yiw"/>
                 <outlet property="errorField" destination="G1N-th-ZtP" id="3Qf-fy-ie3"/>
-                <outlet property="finalContainer" destination="srJ-1d-Sbs" id="BP0-xw-uwV"/>
+                <outlet property="finalContainer" destination="x74-yg-k83" id="imC-gT-UVq"/>
                 <outlet property="initialContainer" destination="xUT-yB-g8Q" id="CZQ-jg-fnH"/>
                 <outlet property="passwordField" destination="vej-Z8-dOm" id="Ff0-Rb-Al6"/>
                 <outlet property="progressContainer" destination="AGJ-1n-ZWv" id="1i0-bR-eog"/>
                 <outlet property="progressIndicator" destination="Ovf-4O-7LZ" id="3ak-Ju-PkY"/>
-                <outlet property="resultField" destination="M0M-Fg-Znl" id="Y5c-jF-Tij"/>
+                <outlet property="resultField" destination="VNw-04-tBM" id="h4m-8G-6ql"/>
                 <outlet property="window" destination="QvC-M9-y7g" id="bos-rN-Jgz"/>
             </connections>
         </customObject>
@@ -24,7 +24,7 @@
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="410" height="161"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="877"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1792" height="1095"/>
             <view key="contentView" id="EiT-Mj-1SZ">
                 <rect key="frame" x="0.0" y="0.0" width="410" height="161"/>
                 <autoresizingMask key="autoresizingMask"/>
@@ -41,7 +41,7 @@
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cxh-K7-1eh">
-                                <rect key="frame" x="327" y="13" width="59" height="32"/>
+                                <rect key="frame" x="326" y="13" width="61" height="32"/>
                                 <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="VN1-A3-RIh">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -62,12 +62,24 @@
                             <constraint firstItem="cxh-K7-1eh" firstAttribute="width" secondItem="ty1-sj-tT6" secondAttribute="height" multiplier="47:171" constant="5.4970760233918128" id="xxl-WJ-uWd"/>
                         </constraints>
                     </customView>
-                    <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="srJ-1d-Sbs">
-                        <rect key="frame" x="15" y="0.0" width="380" height="151"/>
+                    <customView translatesAutoresizingMaskIntoConstraints="NO" id="x74-yg-k83">
+                        <rect key="frame" x="0.0" y="0.0" width="410" height="161"/>
                         <subviews>
-                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="I5i-KQ-7yI">
-                                <rect key="frame" x="327" y="13" width="59" height="32"/>
-                                <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="dfD-AK-f3R">
+                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="VNw-04-tBM">
+                                <rect key="frame" x="13" y="44" width="384" height="107"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="107" id="0l9-Up-cBX"/>
+                                    <constraint firstAttribute="width" constant="380" id="TWI-ML-vyj"/>
+                                </constraints>
+                                <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" placeholderString="" id="gfX-Ex-KmT">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ZmT-pV-DJ4">
+                                <rect key="frame" x="344" y="18" width="53" height="32"/>
+                                <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="za3-Gb-9zk">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
                                     <string key="keyEquivalent" base64-UTF8="YES">
@@ -75,26 +87,16 @@
 </string>
                                 </buttonCell>
                                 <connections>
-                                    <action selector="cancelPressed:" target="-2" id="NWs-SH-M68"/>
+                                    <action selector="cancelPressed:" target="-2" id="CKs-WT-7yx"/>
                                 </connections>
                             </button>
-                            <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="M0M-Fg-Znl">
-                                <rect key="frame" x="-2" y="44" width="384" height="107"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="107" id="egH-qZ-wBG"/>
-                                    <constraint firstAttribute="width" constant="380" id="lCL-W1-aOP"/>
-                                </constraints>
-                                <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" placeholderString="" id="ezj-X9-NQd">
-                                    <font key="font" metaFont="system"/>
-                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                                </textFieldCell>
-                            </textField>
                         </subviews>
                         <constraints>
-                            <constraint firstItem="I5i-KQ-7yI" firstAttribute="width" secondItem="srJ-1d-Sbs" secondAttribute="height" multiplier="47:171" constant="5.4970760233918128" id="1kj-gX-F60"/>
-                            <constraint firstAttribute="trailing" secondItem="I5i-KQ-7yI" secondAttribute="trailing" id="L4m-3f-iAH"/>
-                            <constraint firstAttribute="bottom" secondItem="I5i-KQ-7yI" secondAttribute="bottom" constant="20" id="OA3-eH-jPg"/>
+                            <constraint firstItem="VNw-04-tBM" firstAttribute="leading" secondItem="x74-yg-k83" secondAttribute="leading" constant="15" id="0iJ-sg-9Ep"/>
+                            <constraint firstItem="VNw-04-tBM" firstAttribute="top" secondItem="x74-yg-k83" secondAttribute="top" constant="10" id="4Sc-xg-Blv"/>
+                            <constraint firstAttribute="trailing" secondItem="VNw-04-tBM" secondAttribute="trailing" constant="15" id="aic-oU-DzB"/>
+                            <constraint firstAttribute="bottom" secondItem="ZmT-pV-DJ4" secondAttribute="bottom" constant="25" id="bAW-q0-dqL"/>
+                            <constraint firstAttribute="trailing" secondItem="ZmT-pV-DJ4" secondAttribute="trailing" constant="20" id="dvC-D7-SEW"/>
                         </constraints>
                     </customView>
                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="AGJ-1n-ZWv">
@@ -118,7 +120,7 @@
                         <rect key="frame" x="15" y="0.0" width="380" height="151"/>
                         <subviews>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bcr-Pl-Fz9">
-                                <rect key="frame" x="50" y="68" width="63" height="17"/>
+                                <rect key="frame" x="50" y="70" width="63" height="16"/>
                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Password" id="vwh-K9-3O9">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -126,7 +128,7 @@
                                 </textFieldCell>
                             </textField>
                             <secureTextField verticalHuggingPriority="750" ambiguous="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vej-Z8-dOm">
-                                <rect key="frame" x="118" y="65" width="210" height="22"/>
+                                <rect key="frame" x="118" y="67" width="210" height="21"/>
                                 <secureTextFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" borderStyle="bezel" placeholderString="Password..." drawsBackground="YES" usesSingleLineMode="YES" id="xqz-Uz-hqU">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -149,7 +151,7 @@
                                 </connections>
                             </secureTextField>
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="YR8-e7-f8B">
-                                <rect key="frame" x="18" y="126" width="231" height="17"/>
+                                <rect key="frame" x="18" y="127" width="231" height="16"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="227" id="6Fn-hi-Ji3"/>
                                 </constraints>
@@ -160,7 +162,7 @@
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="oXB-Be-LaB">
-                                <rect key="frame" x="327" y="13" width="59" height="32"/>
+                                <rect key="frame" x="334" y="13" width="53" height="32"/>
                                 <buttonCell key="cell" type="push" title="OK" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="rW5-Il-5YD">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -173,7 +175,7 @@
                                 </connections>
                             </button>
                             <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Qx0-KE-jEl">
-                                <rect key="frame" x="18" y="104" width="344" height="14"/>
+                                <rect key="frame" x="18" y="105" width="344" height="14"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="14" id="g34-vr-Zas"/>
                                 </constraints>
@@ -184,7 +186,7 @@
                                 </textFieldCell>
                             </textField>
                             <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Yf1-T3-fOf">
-                                <rect key="frame" x="245" y="13" width="82" height="32"/>
+                                <rect key="frame" x="260" y="13" width="76" height="32"/>
                                 <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="cSU-aD-OwX">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                     <font key="font" metaFont="system"/>
@@ -217,22 +219,20 @@
                 <constraints>
                     <constraint firstAttribute="trailing" secondItem="xUT-yB-g8Q" secondAttribute="trailing" constant="15" id="0cz-Qg-8O3"/>
                     <constraint firstAttribute="bottom" secondItem="ty1-sj-tT6" secondAttribute="bottom" id="1bi-Qk-WJf"/>
-                    <constraint firstItem="M0M-Fg-Znl" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="10" id="7Rm-Mq-9lm"/>
                     <constraint firstItem="xUT-yB-g8Q" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="10" id="80V-3H-yhe"/>
                     <constraint firstItem="ty1-sj-tT6" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="15" id="JfP-nv-HzG"/>
-                    <constraint firstItem="srJ-1d-Sbs" firstAttribute="leading" secondItem="xUT-yB-g8Q" secondAttribute="leading" id="LX2-ln-cMG"/>
+                    <constraint firstItem="x74-yg-k83" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="Jsf-ix-wey"/>
+                    <constraint firstItem="x74-yg-k83" firstAttribute="centerY" secondItem="AGJ-1n-ZWv" secondAttribute="centerY" id="SCz-OX-qMj"/>
                     <constraint firstItem="ty1-sj-tT6" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" constant="10" id="WRY-iS-AnI"/>
-                    <constraint firstItem="srJ-1d-Sbs" firstAttribute="trailing" secondItem="xUT-yB-g8Q" secondAttribute="trailing" id="X7E-dC-Irw"/>
                     <constraint firstItem="AGJ-1n-ZWv" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="15" id="fQD-sb-Ef1"/>
                     <constraint firstItem="xUT-yB-g8Q" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="15" id="hyR-9O-NC2"/>
                     <constraint firstAttribute="trailing" secondItem="ty1-sj-tT6" secondAttribute="trailing" constant="15" id="kMD-cN-UU3"/>
-                    <constraint firstAttribute="trailing" secondItem="M0M-Fg-Znl" secondAttribute="trailing" constant="15" id="nhW-2W-aOa"/>
+                    <constraint firstItem="x74-yg-k83" firstAttribute="centerX" secondItem="EiT-Mj-1SZ" secondAttribute="centerX" id="mAl-Nx-V5T"/>
                     <constraint firstAttribute="bottom" secondItem="xUT-yB-g8Q" secondAttribute="bottom" id="p1f-f1-8dd"/>
                     <constraint firstAttribute="trailing" secondItem="AGJ-1n-ZWv" secondAttribute="trailing" constant="15" id="pRc-7V-4dD"/>
-                    <constraint firstItem="srJ-1d-Sbs" firstAttribute="top" secondItem="xUT-yB-g8Q" secondAttribute="top" id="uGQ-Kt-GUW"/>
                     <constraint firstItem="AGJ-1n-ZWv" firstAttribute="top" secondItem="EiT-Mj-1SZ" secondAttribute="top" id="xBv-N5-u4V"/>
                     <constraint firstAttribute="bottom" secondItem="AGJ-1n-ZWv" secondAttribute="bottom" id="xtD-fH-ddM"/>
-                    <constraint firstItem="M0M-Fg-Znl" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" constant="15" id="xze-0s-FPH"/>
+                    <constraint firstItem="x74-yg-k83" firstAttribute="leading" secondItem="EiT-Mj-1SZ" secondAttribute="leading" id="zFy-40-Ex5"/>
                 </constraints>
             </view>
             <connections>