diff --git a/Base.lproj/MainMenu.xib b/Base.lproj/MainMenu.xib
index 01e6cebdf..428acf87d 100644
--- a/Base.lproj/MainMenu.xib
+++ b/Base.lproj/MainMenu.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="20037" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21179.7" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="20037"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21179.7"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -57,16 +57,20 @@
                                                             <rect key="frame" x="11" y="3" width="69" height="18"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="w5u-JQ-3Hf">
+                                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="w5u-JQ-3Hf">
                                                                     <rect key="frame" x="0.0" y="1" width="69" height="16"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
-                                                                    <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="FMU-QZ-NdQ">
+                                                                    <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Table View Cell" id="FMU-QZ-NdQ">
                                                                         <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>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="w5u-JQ-3Hf" firstAttribute="centerY" secondItem="5N3-SP-Y8z" secondAttribute="centerY" id="HXG-h8-nw4"/>
+                                                                <constraint firstItem="w5u-JQ-3Hf" firstAttribute="centerX" secondItem="5N3-SP-Y8z" secondAttribute="centerX" id="uwa-Cf-eas"/>
+                                                                <constraint firstItem="w5u-JQ-3Hf" firstAttribute="leading" secondItem="5N3-SP-Y8z" secondAttribute="leading" constant="2" id="vX3-J5-AHF"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="w5u-JQ-3Hf" id="uqw-tc-LMI"/>
                                                             </connections>
@@ -94,14 +98,15 @@
                                                             <rect key="frame" x="83" y="3" width="20" height="17"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ERj-i9-caa">
+                                                                <imageView horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="ERj-i9-caa">
                                                                     <rect key="frame" x="0.0" y="3" width="17" height="11"/>
-                                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                                                    <constraints>
+                                                                        <constraint firstAttribute="height" constant="11" id="hCf-q7-ikN"/>
+                                                                    </constraints>
                                                                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" id="8rO-fU-Njw"/>
                                                                 </imageView>
-                                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5cp-JI-ogI">
+                                                                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsExpansionToolTips="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5cp-JI-ogI">
                                                                     <rect key="frame" x="23" y="0.0" width="4" height="17"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="wky-z8-Cj5">
                                                                         <font key="font" metaFont="system"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -109,6 +114,15 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="5cp-JI-ogI" firstAttribute="leading" secondItem="ERj-i9-caa" secondAttribute="trailing" constant="8" symbolic="YES" id="ABH-SH-nWl"/>
+                                                                <constraint firstItem="ERj-i9-caa" firstAttribute="centerY" secondItem="5cp-JI-ogI" secondAttribute="centerY" id="CrU-lg-DNn"/>
+                                                                <constraint firstItem="ERj-i9-caa" firstAttribute="leading" secondItem="Vw5-xt-0vG" secondAttribute="leading" id="Hc2-EY-Qig"/>
+                                                                <constraint firstItem="5cp-JI-ogI" firstAttribute="top" secondItem="Vw5-xt-0vG" secondAttribute="top" id="het-sS-7De"/>
+                                                                <constraint firstAttribute="trailing" secondItem="ERj-i9-caa" secondAttribute="trailing" constant="3" id="iN8-aE-Xpq"/>
+                                                                <constraint firstAttribute="trailing" secondItem="5cp-JI-ogI" secondAttribute="trailing" constant="-5" id="rMy-1B-KH4"/>
+                                                                <constraint firstItem="ERj-i9-caa" firstAttribute="top" secondItem="Vw5-xt-0vG" secondAttribute="top" constant="3" id="rpD-06-DRu"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="imageView" destination="ERj-i9-caa" id="TmP-fQ-D5k"/>
                                                                 <outlet property="textField" destination="5cp-JI-ogI" id="OpS-BY-UJn"/>
@@ -133,9 +147,8 @@
                                                             <rect key="frame" x="106" y="3" width="126" height="18"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="exY-Bg-Mjm">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="exY-Bg-Mjm">
                                                                     <rect key="frame" x="0.0" y="1" width="126" height="16"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="sdo-Sm-KPH">
                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -143,6 +156,11 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="exY-Bg-Mjm" firstAttribute="leading" secondItem="ZCP-Dx-UBV" secondAttribute="leading" constant="2" id="Aal-xf-u6t"/>
+                                                                <constraint firstItem="exY-Bg-Mjm" firstAttribute="centerY" secondItem="ZCP-Dx-UBV" secondAttribute="centerY" id="sUW-NK-0ha"/>
+                                                                <constraint firstItem="exY-Bg-Mjm" firstAttribute="centerX" secondItem="ZCP-Dx-UBV" secondAttribute="centerX" id="tPc-Jv-ww7"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="exY-Bg-Mjm" id="LVE-SN-zln"/>
                                                             </connections>
@@ -172,9 +190,8 @@
                                                             <rect key="frame" x="1" y="3" width="0.0" height="18"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ZWb-jm-i9i">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="ZWb-jm-i9i">
                                                                     <rect key="frame" x="0.0" y="1" width="4" height="16"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="3QN-Ok-QPu">
                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -182,6 +199,11 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="ZWb-jm-i9i" firstAttribute="leading" secondItem="x12-5b-Mmv" secondAttribute="leading" constant="2" id="JKi-VH-ZrY"/>
+                                                                <constraint firstItem="ZWb-jm-i9i" firstAttribute="centerY" secondItem="x12-5b-Mmv" secondAttribute="centerY" id="MGR-vt-jEV"/>
+                                                                <constraint firstAttribute="trailing" secondItem="ZWb-jm-i9i" secondAttribute="trailing" constant="-2" id="cfH-87-U3b"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="ZWb-jm-i9i" id="EaM-6d-0Ni"/>
                                                             </connections>
@@ -213,9 +235,8 @@
                                                             <rect key="frame" x="235" y="3" width="149" height="18"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="1WK-qN-Mgj">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="1WK-qN-Mgj">
                                                                     <rect key="frame" x="0.0" y="1" width="149" height="16"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="71l-3L-S3g">
                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -223,6 +244,11 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="1WK-qN-Mgj" firstAttribute="leading" secondItem="gpC-Oe-Rog" secondAttribute="leading" constant="2" id="AWa-d3-IBL"/>
+                                                                <constraint firstItem="1WK-qN-Mgj" firstAttribute="centerY" secondItem="gpC-Oe-Rog" secondAttribute="centerY" id="OFh-jt-0g8"/>
+                                                                <constraint firstItem="1WK-qN-Mgj" firstAttribute="centerX" secondItem="gpC-Oe-Rog" secondAttribute="centerX" id="hHm-aK-ovQ"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="1WK-qN-Mgj" id="RoA-Ff-UMU"/>
                                                             </connections>
@@ -253,9 +279,8 @@
                                                             <rect key="frame" x="387" y="3" width="151" height="18"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="nEt-s5-vRX">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="nEt-s5-vRX">
                                                                     <rect key="frame" x="0.0" y="1" width="151" height="16"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="moV-3G-GpB">
                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -263,6 +288,11 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="nEt-s5-vRX" firstAttribute="centerX" secondItem="1ed-gX-bct" secondAttribute="centerX" id="6Cl-EX-a8I"/>
+                                                                <constraint firstItem="nEt-s5-vRX" firstAttribute="leading" secondItem="1ed-gX-bct" secondAttribute="leading" constant="2" id="jcW-Mg-08c"/>
+                                                                <constraint firstItem="nEt-s5-vRX" firstAttribute="centerY" secondItem="1ed-gX-bct" secondAttribute="centerY" id="pFM-Gn-Lfg"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="nEt-s5-vRX" id="pMp-oO-lhp"/>
                                                             </connections>
@@ -292,9 +322,8 @@
                                                             <rect key="frame" x="541" y="3" width="95" height="18"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="tHy-sM-HDB">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="tHy-sM-HDB">
                                                                     <rect key="frame" x="0.0" y="1" width="95" height="16"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="Igo-5f-yim">
                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -302,6 +331,11 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="tHy-sM-HDB" firstAttribute="centerX" secondItem="hhB-nv-e78" secondAttribute="centerX" id="Oac-oh-Ref"/>
+                                                                <constraint firstItem="tHy-sM-HDB" firstAttribute="centerY" secondItem="hhB-nv-e78" secondAttribute="centerY" id="hf3-UE-cGb"/>
+                                                                <constraint firstItem="tHy-sM-HDB" firstAttribute="leading" secondItem="hhB-nv-e78" secondAttribute="leading" constant="2" id="yi7-Xt-oug"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="tHy-sM-HDB" id="Hae-Kh-oLV"/>
                                                             </connections>
@@ -332,9 +366,8 @@
                                                             <rect key="frame" x="639" y="3" width="94" height="18"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="bOi-LI-TDx">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="bOi-LI-TDx">
                                                                     <rect key="frame" x="0.0" y="1" width="94" height="16"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="C2Q-qG-dwX">
                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -342,6 +375,11 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="bOi-LI-TDx" firstAttribute="centerY" secondItem="q93-oh-i5T" secondAttribute="centerY" id="5h5-rG-51v"/>
+                                                                <constraint firstItem="bOi-LI-TDx" firstAttribute="centerX" secondItem="q93-oh-i5T" secondAttribute="centerX" id="OdF-G1-J5m"/>
+                                                                <constraint firstItem="bOi-LI-TDx" firstAttribute="leading" secondItem="q93-oh-i5T" secondAttribute="leading" constant="2" id="u3q-rI-YLk"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="bOi-LI-TDx" id="N91-MC-aPF"/>
                                                             </connections>
@@ -369,9 +407,8 @@
                                                             <rect key="frame" x="736" y="3" width="144" height="18"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yW6-2w-6mN">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="yW6-2w-6mN">
                                                                     <rect key="frame" x="0.0" y="1" width="144" height="16"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="js2-sT-U4M">
                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -379,6 +416,11 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="yW6-2w-6mN" firstAttribute="centerY" secondItem="rRl-p9-Awr" secondAttribute="centerY" id="VQc-pH-CbU"/>
+                                                                <constraint firstItem="yW6-2w-6mN" firstAttribute="leading" secondItem="rRl-p9-Awr" secondAttribute="leading" constant="2" id="hFG-XE-S3R"/>
+                                                                <constraint firstItem="yW6-2w-6mN" firstAttribute="centerX" secondItem="rRl-p9-Awr" secondAttribute="centerX" id="lwN-5J-H9I"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="yW6-2w-6mN" id="G7S-Se-0cY"/>
                                                             </connections>
@@ -405,9 +447,8 @@
                                                             <rect key="frame" x="883" y="3" width="38" height="18"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="yEY-MI-d3o">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="yEY-MI-d3o">
                                                                     <rect key="frame" x="0.0" y="1" width="38" height="16"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="tus-lr-RhS">
                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -415,6 +456,11 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="yEY-MI-d3o" firstAttribute="leading" secondItem="hgh-VE-5kl" secondAttribute="leading" constant="2" id="2rb-m6-stH"/>
+                                                                <constraint firstItem="yEY-MI-d3o" firstAttribute="centerX" secondItem="hgh-VE-5kl" secondAttribute="centerX" id="ZDd-Fa-3sz"/>
+                                                                <constraint firstItem="yEY-MI-d3o" firstAttribute="centerY" secondItem="hgh-VE-5kl" secondAttribute="centerY" id="dSn-0Q-WK4"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="yEY-MI-d3o" id="EwM-K6-z6F"/>
                                                             </connections>
@@ -441,9 +487,8 @@
                                                             <rect key="frame" x="1" y="3" width="0.0" height="18"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QFJ-4l-2O6">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="QFJ-4l-2O6">
                                                                     <rect key="frame" x="0.0" y="1" width="4" height="16"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="gKK-cS-RP5">
                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -451,6 +496,11 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="QFJ-4l-2O6" firstAttribute="leading" secondItem="d01-Wn-4bd" secondAttribute="leading" constant="2" id="Anm-T6-VYA"/>
+                                                                <constraint firstItem="QFJ-4l-2O6" firstAttribute="centerY" secondItem="d01-Wn-4bd" secondAttribute="centerY" id="PkM-BZ-kEN"/>
+                                                                <constraint firstAttribute="trailing" secondItem="QFJ-4l-2O6" secondAttribute="trailing" constant="-2" id="tm6-tq-SsH"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="QFJ-4l-2O6" id="ATk-8F-J0f"/>
                                                             </connections>
@@ -481,9 +531,8 @@
                                                             <rect key="frame" x="1" y="3" width="0.0" height="18"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Qvd-sk-vRc">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="Qvd-sk-vRc">
                                                                     <rect key="frame" x="0.0" y="1" width="4" height="16"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="YwT-z9-2d2">
                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -491,6 +540,11 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstItem="Qvd-sk-vRc" firstAttribute="centerY" secondItem="ICT-dh-UfT" secondAttribute="centerY" id="JkJ-Ej-QsL"/>
+                                                                <constraint firstAttribute="trailing" secondItem="Qvd-sk-vRc" secondAttribute="trailing" constant="-2" id="eUw-10-LM4"/>
+                                                                <constraint firstItem="Qvd-sk-vRc" firstAttribute="leading" secondItem="ICT-dh-UfT" secondAttribute="leading" constant="2" id="tfs-5r-fnT"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="Qvd-sk-vRc" id="wzs-Gd-GjV"/>
                                                             </connections>
@@ -521,9 +575,8 @@
                                                             <rect key="frame" x="1" y="3" width="0.0" height="18"/>
                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                             <subviews>
-                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="gXW-DX-EsQ">
+                                                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="gXW-DX-EsQ">
                                                                     <rect key="frame" x="0.0" y="1" width="4" height="16"/>
-                                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
                                                                     <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" title="Table View Cell" id="vaJ-Bc-ebE">
                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -531,6 +584,11 @@
                                                                     </textFieldCell>
                                                                 </textField>
                                                             </subviews>
+                                                            <constraints>
+                                                                <constraint firstAttribute="trailing" secondItem="gXW-DX-EsQ" secondAttribute="trailing" constant="-2" id="Hsy-ks-y9a"/>
+                                                                <constraint firstItem="gXW-DX-EsQ" firstAttribute="centerY" secondItem="PuO-Ss-1Vs" secondAttribute="centerY" id="ck5-LT-g3d"/>
+                                                                <constraint firstItem="gXW-DX-EsQ" firstAttribute="leading" secondItem="PuO-Ss-1Vs" secondAttribute="leading" constant="2" id="pxP-Je-913"/>
+                                                            </constraints>
                                                             <connections>
                                                                 <outlet property="textField" destination="gXW-DX-EsQ" id="kM6-6c-0sa"/>
                                                             </connections>
@@ -602,8 +660,9 @@
                     </textField>
                 </subviews>
                 <constraints>
-                    <constraint firstAttribute="bottom" secondItem="2123" secondAttribute="bottom" constant="22" id="CIQ-D5-aGm"/>
-                    <constraint firstAttribute="bottom" secondItem="778" secondAttribute="bottom" constant="4" id="WM0-sc-crj"/>
+                    <constraint firstAttribute="trailing" secondItem="2123" secondAttribute="trailing" id="cHp-aQ-EyQ"/>
+                    <constraint firstAttribute="bottom" secondItem="778" secondAttribute="bottom" constant="4" id="ecR-9t-bvJ"/>
+                    <constraint firstItem="2123" firstAttribute="leading" secondItem="2" secondAttribute="leading" id="wrv-PH-gyc"/>
                 </constraints>
                 <visibilityPriorities>
                     <integer value="1000"/>