From 50cd33ab39061d686831d6bcf5d99c7352f8e857 Mon Sep 17 00:00:00 2001
From: Damiano Galassi <damiog@gmail.com>
Date: Sat, 9 Jun 2018 13:51:45 +0200
Subject: [PATCH] MacGui: improve UI layout when localised.

---
 .../HBEncodingProgressHUDController.xib       |  33 +++--
 macosx/Base.lproj/HBPictureHUDController.xib  | 113 +++++++++++------
 macosx/Base.lproj/HBPictureViewController.xib |  32 ++---
 macosx/Base.lproj/HBPlayerHUDController.xib   | 116 ++++++++++++------
 macosx/Base.lproj/HBPreviewViewController.xib |   7 +-
 macosx/Base.lproj/HBSummaryViewController.xib |  19 ++-
 macosx/Base.lproj/HBTitleSelection.xib        |   9 +-
 macosx/Base.lproj/PictureSettings.xib         |  38 +++---
 macosx/Base.lproj/Queue.xib                   |  37 ++++--
 macosx/Base.lproj/Video.xib                   |  25 ++--
 macosx/HBFilters+UIAdditions.m                |  12 +-
 macosx/HBSummaryViewController.m              |   6 +-
 12 files changed, 277 insertions(+), 170 deletions(-)

diff --git a/macosx/Base.lproj/HBEncodingProgressHUDController.xib b/macosx/Base.lproj/HBEncodingProgressHUDController.xib
index eec4f6406..92885ea8f 100644
--- a/macosx/Base.lproj/HBEncodingProgressHUDController.xib
+++ b/macosx/Base.lproj/HBEncodingProgressHUDController.xib
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11129.15" systemVersion="15G12a" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11129.15"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HBEncodingProgressHUDController">
@@ -18,13 +19,11 @@
             <rect key="frame" x="0.0" y="0.0" width="460" height="100"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
-                <progressIndicator verticalHuggingPriority="750" fixedFrame="YES" maxValue="1" bezeled="NO" controlSize="small" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="oJT-Rc-VeH">
-                    <rect key="frame" x="20" y="27" width="346" height="12"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <progressIndicator wantsLayer="YES" verticalHuggingPriority="750" maxValue="1" bezeled="NO" controlSize="small" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="oJT-Rc-VeH">
+                    <rect key="frame" x="17" y="27" width="365" height="12"/>
                 </progressIndicator>
-                <button toolTip="Cancel Live Preview Encode" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SEa-H6-T26">
-                    <rect key="frame" x="383" y="25" width="58" height="16"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <button toolTip="Cancel Live Preview Encode" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SEa-H6-T26">
+                    <rect key="frame" x="389" y="25" width="55" height="16"/>
                     <buttonCell key="cell" type="push" title="Cancel" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Ha0-iE-RLa">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="miniSystem"/>
@@ -33,9 +32,8 @@
                         <action selector="cancelEncoding:" target="-2" id="XDk-r6-Ihc"/>
                     </connections>
                 </button>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="eKh-n7-BCx">
-                    <rect key="frame" x="17" y="60" width="425" height="14"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eKh-n7-BCx">
+                    <rect key="frame" x="15" y="60" width="430" height="14"/>
                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="left" title="Preparing Preview" id="tM8-gj-kBo">
                         <font key="font" metaFont="smallSystemBold"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -43,6 +41,17 @@
                     </textFieldCell>
                 </textField>
             </subviews>
+            <constraints>
+                <constraint firstItem="oJT-Rc-VeH" firstAttribute="top" secondItem="eKh-n7-BCx" secondAttribute="bottom" constant="21" id="1tD-Xt-RgM"/>
+                <constraint firstItem="SEa-H6-T26" firstAttribute="leading" secondItem="oJT-Rc-VeH" secondAttribute="trailing" constant="8" id="DoU-pN-uGc"/>
+                <constraint firstItem="eKh-n7-BCx" firstAttribute="top" secondItem="Bz7-r6-NCQ" secondAttribute="top" constant="26" id="KxF-bd-h6J"/>
+                <constraint firstAttribute="bottom" secondItem="oJT-Rc-VeH" secondAttribute="bottom" constant="27" id="UPR-0y-JpX"/>
+                <constraint firstItem="oJT-Rc-VeH" firstAttribute="leading" secondItem="Bz7-r6-NCQ" secondAttribute="leading" constant="17" id="bYJ-7Y-SsV"/>
+                <constraint firstAttribute="trailing" secondItem="SEa-H6-T26" secondAttribute="trailing" constant="17" id="umg-H6-82U"/>
+                <constraint firstAttribute="trailing" secondItem="eKh-n7-BCx" secondAttribute="trailing" constant="17" id="yz5-nD-9lZ"/>
+                <constraint firstItem="SEa-H6-T26" firstAttribute="centerY" secondItem="oJT-Rc-VeH" secondAttribute="centerY" id="z66-s2-3yN"/>
+                <constraint firstItem="eKh-n7-BCx" firstAttribute="leading" secondItem="Bz7-r6-NCQ" secondAttribute="leading" constant="17" id="zKA-IC-ZFj"/>
+            </constraints>
             <point key="canvasLocation" x="262" y="401"/>
         </customView>
     </objects>
diff --git a/macosx/Base.lproj/HBPictureHUDController.xib b/macosx/Base.lproj/HBPictureHUDController.xib
index 9047163fe..54f0dab84 100644
--- a/macosx/Base.lproj/HBPictureHUDController.xib
+++ b/macosx/Base.lproj/HBPictureHUDController.xib
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <development version="7000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HBPictureHUDController">
@@ -24,9 +24,11 @@
             <rect key="frame" x="0.0" y="0.0" width="460" height="100"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
-                <button toolTip="Encode and play a preview video using current settings." verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="16b-R9-bBU">
-                    <rect key="frame" x="17" y="11" width="80" height="16"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <button toolTip="Encode and play a preview video using current settings." horizontalHuggingPriority="249" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="16b-R9-bBU">
+                    <rect key="frame" x="16" y="11" width="79" height="16"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="ir9-qd-gak"/>
+                    </constraints>
                     <buttonCell key="cell" type="push" title="Live Preview" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="vkh-GY-5qx">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="miniSystem"/>
@@ -35,9 +37,11 @@
                         <action selector="createMoviePreview:" target="-2" id="rhf-gy-aMT"/>
                     </connections>
                 </button>
-                <button toolTip="Show picture settings." verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mV7-hU-tMt">
-                    <rect key="frame" x="378" y="11" width="61" height="16"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <button toolTip="Show picture settings." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="mV7-hU-tMt">
+                    <rect key="frame" x="383" y="11" width="61" height="16"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="xea-W9-xGB"/>
+                    </constraints>
                     <buttonCell key="cell" type="push" title="Settings" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="NWd-Lq-c1A">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="miniSystem"/>
@@ -46,38 +50,33 @@
                         <action selector="showPictureSettings:" target="-2" id="aDd-cp-S1k"/>
                     </connections>
                 </button>
-                <button toolTip="Scale preview to fill the display." verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="12K-c3-Z7A">
-                    <rect key="frame" x="276" y="11" width="96" height="16"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="push" title="Scale To Screen" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="STc-Po-p1X">
-                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                        <font key="font" metaFont="miniSystem"/>
-                    </buttonCell>
-                    <connections>
-                        <action selector="toggleScaleToScreen:" target="-2" id="bbI-nW-6zM"/>
-                    </connections>
-                </button>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5T3-Vx-mC1">
-                    <rect key="frame" x="105" y="14" width="48" height="11"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5T3-Vx-mC1">
+                    <rect key="frame" x="109" y="14" width="48" height="11"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="30" id="wtS-2b-Ijm"/>
+                    </constraints>
                     <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="Duration:" id="USR-Qf-N5v">
                         <font key="font" metaFont="miniSystemBold"/>
                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vrm-He-CjP">
-                    <rect key="frame" x="215" y="14" width="21" height="11"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Vrm-He-CjP">
+                    <rect key="frame" x="211" y="14" width="21" height="11"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="17" id="88j-t5-f6t"/>
+                    </constraints>
                     <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" alignment="right" title="sec" id="ksF-Ma-hB1">
                         <font key="font" metaFont="miniSystemBold"/>
                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <popUpButton toolTip="Duration to encode in seconds." verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ASA-X8-16P">
+                <popUpButton toolTip="Duration to encode in seconds." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ASA-X8-16P">
                     <rect key="frame" x="158" y="12" width="53" height="15"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="50" id="JLd-YP-qt1"/>
+                    </constraints>
                     <popUpButtonCell key="cell" type="push" title="240" bezelStyle="rounded" alignment="left" controlSize="mini" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" inset="2" selectedItem="XYh-Ls-slf" id="yDS-gf-Y4N">
                         <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="miniSystem"/>
@@ -92,9 +91,8 @@
                         <action selector="previewDurationPopUpChanged:" target="-2" id="JSm-Eo-Ijw"/>
                     </connections>
                 </popUpButton>
-                <slider toolTip="Starting point for the preview encode." verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="wUk-SQ-GhS">
-                    <rect key="frame" x="18" y="39" width="420" height="15"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <slider toolTip="Starting point for the preview encode." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="wUk-SQ-GhS">
+                    <rect key="frame" x="17" y="38" width="426" height="15"/>
                     <sliderCell key="cell" controlSize="mini" continuous="YES" alignment="left" maxValue="9" tickMarkPosition="above" numberOfTickMarks="10" allowsTickMarkValuesOnly="YES" sliderType="linear" id="dPk-jb-w9o">
                         <font key="font" metaFont="miniSystem"/>
                     </sliderCell>
@@ -103,26 +101,65 @@
                         <action selector="pictureSliderChanged:" target="-2" id="576-54-fMW"/>
                     </connections>
                 </slider>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="426" translatesAutoresizingMaskIntoConstraints="NO" id="MkW-KN-I1h">
-                    <rect key="frame" x="15" y="55" width="430" height="20"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="426" translatesAutoresizingMaskIntoConstraints="NO" id="MkW-KN-I1h">
+                    <rect key="frame" x="15" y="54" width="430" height="20"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="20" id="Wqt-oa-eQj"/>
+                    </constraints>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" id="DKr-Lp-f2U">
                         <font key="font" metaFont="smallSystemBold"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" fixedFrame="YES" preferredMaxLayoutWidth="422" translatesAutoresizingMaskIntoConstraints="NO" id="7UR-Zz-7iX">
-                    <rect key="frame" x="15" y="77" width="426" height="12"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="600" translatesAutoresizingMaskIntoConstraints="NO" id="7UR-Zz-7iX">
+                    <rect key="frame" x="15" y="76" width="430" height="12"/>
                     <textFieldCell key="cell" controlSize="mini" sendsActionOnEndEditing="YES" alignment="left" id="CeL-Pu-NS6">
                         <font key="font" metaFont="miniSystemBold"/>
                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
+                <button toolTip="Scale preview to fill the display." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="12K-c3-Z7A">
+                    <rect key="frame" x="282" y="11" width="95" height="16"/>
+                    <constraints>
+                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="50" id="N0p-GD-cNh"/>
+                    </constraints>
+                    <buttonCell key="cell" type="push" title="Scale To Screen" bezelStyle="rounded" alignment="center" controlSize="mini" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="STc-Po-p1X">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="miniSystem"/>
+                    </buttonCell>
+                    <connections>
+                        <action selector="toggleScaleToScreen:" target="-2" id="bbI-nW-6zM"/>
+                    </connections>
+                </button>
             </subviews>
-            <point key="canvasLocation" x="183" y="165"/>
+            <constraints>
+                <constraint firstItem="5T3-Vx-mC1" firstAttribute="firstBaseline" secondItem="16b-R9-bBU" secondAttribute="firstBaseline" id="1zX-eR-aGy"/>
+                <constraint firstAttribute="trailing" secondItem="MkW-KN-I1h" secondAttribute="trailing" constant="17" id="51b-ga-cex"/>
+                <constraint firstItem="16b-R9-bBU" firstAttribute="top" secondItem="wUk-SQ-GhS" secondAttribute="bottom" constant="11" id="GV8-xv-F3F"/>
+                <constraint firstItem="7UR-Zz-7iX" firstAttribute="leading" secondItem="agq-EJ-miM" secondAttribute="leading" constant="17" id="JPF-0p-EcT"/>
+                <constraint firstItem="mV7-hU-tMt" firstAttribute="leading" secondItem="12K-c3-Z7A" secondAttribute="trailing" constant="8" id="Kuw-QY-Ctl"/>
+                <constraint firstItem="MkW-KN-I1h" firstAttribute="top" secondItem="7UR-Zz-7iX" secondAttribute="bottom" constant="2" id="LMS-rl-nxL"/>
+                <constraint firstAttribute="trailing" secondItem="wUk-SQ-GhS" secondAttribute="trailing" constant="17" id="Nwp-nu-Nm6"/>
+                <constraint firstItem="5T3-Vx-mC1" firstAttribute="leading" secondItem="16b-R9-bBU" secondAttribute="trailing" constant="17" id="NyV-CH-jxk"/>
+                <constraint firstItem="5T3-Vx-mC1" firstAttribute="firstBaseline" secondItem="ASA-X8-16P" secondAttribute="firstBaseline" id="VW0-yQ-ZHQ"/>
+                <constraint firstItem="ASA-X8-16P" firstAttribute="firstBaseline" secondItem="Vrm-He-CjP" secondAttribute="firstBaseline" id="de5-l2-64W"/>
+                <constraint firstItem="Vrm-He-CjP" firstAttribute="leading" secondItem="ASA-X8-16P" secondAttribute="trailing" constant="4" id="efc-p5-b0P"/>
+                <constraint firstAttribute="trailing" secondItem="mV7-hU-tMt" secondAttribute="trailing" constant="17" id="fdl-Gj-YwQ"/>
+                <constraint firstAttribute="bottom" secondItem="16b-R9-bBU" secondAttribute="bottom" constant="12" id="j44-j4-IY0"/>
+                <constraint firstItem="12K-c3-Z7A" firstAttribute="firstBaseline" secondItem="mV7-hU-tMt" secondAttribute="firstBaseline" id="keF-Yc-6WX"/>
+                <constraint firstItem="Vrm-He-CjP" firstAttribute="firstBaseline" secondItem="12K-c3-Z7A" secondAttribute="firstBaseline" id="pXi-kt-bgj"/>
+                <constraint firstItem="ASA-X8-16P" firstAttribute="leading" secondItem="5T3-Vx-mC1" secondAttribute="trailing" constant="4" id="sa0-fe-7P6"/>
+                <constraint firstItem="wUk-SQ-GhS" firstAttribute="leading" secondItem="agq-EJ-miM" secondAttribute="leading" constant="17" id="uUN-j3-4DW"/>
+                <constraint firstItem="MkW-KN-I1h" firstAttribute="leading" secondItem="agq-EJ-miM" secondAttribute="leading" constant="17" id="uwg-uf-WcV"/>
+                <constraint firstAttribute="trailing" secondItem="7UR-Zz-7iX" secondAttribute="trailing" constant="17" id="uxH-la-pju"/>
+                <constraint firstItem="wUk-SQ-GhS" firstAttribute="top" secondItem="MkW-KN-I1h" secondAttribute="bottom" constant="1" id="vrZ-g3-L7M"/>
+                <constraint firstItem="7UR-Zz-7iX" firstAttribute="top" secondItem="agq-EJ-miM" secondAttribute="top" constant="12" id="xhY-i7-Q2v"/>
+                <constraint firstItem="12K-c3-Z7A" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Vrm-He-CjP" secondAttribute="trailing" constant="8" symbolic="YES" id="ybz-88-aqy"/>
+                <constraint firstItem="16b-R9-bBU" firstAttribute="leading" secondItem="agq-EJ-miM" secondAttribute="leading" constant="17" id="zmJ-qN-Z7W"/>
+            </constraints>
+            <point key="canvasLocation" x="7" y="106"/>
         </customView>
     </objects>
 </document>
diff --git a/macosx/Base.lproj/HBPictureViewController.xib b/macosx/Base.lproj/HBPictureViewController.xib
index ed3c05626..5698f9628 100644
--- a/macosx/Base.lproj/HBPictureViewController.xib
+++ b/macosx/Base.lproj/HBPictureViewController.xib
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -158,7 +158,7 @@ Custom allows for manual settings.</string>
                             </constraints>
                             <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="CIG-PU-RMT">
                                 <font key="font" metaFont="smallSystem"/>
-                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                             <accessibility description="Crop right"/>
@@ -217,7 +217,7 @@ Custom allows for manual settings.</string>
                             </constraints>
                             <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="DzX-1f-HsP">
                                 <font key="font" metaFont="smallSystem"/>
-                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                             <accessibility description="Crop bottom"/>
@@ -251,7 +251,7 @@ Custom allows for manual settings.</string>
                             </constraints>
                             <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="CZs-y7-1JV">
                                 <font key="font" metaFont="smallSystem"/>
-                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                             <accessibility description="Crop top"/>
@@ -285,7 +285,7 @@ Custom allows for manual settings.</string>
                             </constraints>
                             <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="XZs-gj-hoo">
                                 <font key="font" metaFont="smallSystem"/>
-                                <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                             </textFieldCell>
                             <accessibility description="Crop left"/>
@@ -349,7 +349,7 @@ Custom allows for manual settings.</string>
                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="XYg-xi-ExT">
                         <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="jW5-N6-2cB"/>
                         <font key="font" metaFont="smallSystem"/>
-                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                     <accessibility description="Display Width"/>
@@ -396,7 +396,7 @@ Custom allows for manual settings.</string>
                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="w99-9Y-YN4">
                         <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="ygx-uC-eb0"/>
                         <font key="font" metaFont="smallSystem"/>
-                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                     <accessibility description="Pixel Aspect Ration Numerator"/>
@@ -425,7 +425,7 @@ Custom allows for manual settings.</string>
                 </textField>
                 <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="FwZ-6T-zJe">
                     <rect key="frame" x="153" y="298" width="15" height="22"/>
-                    <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="59" id="NP7-P2-Qga">
+                    <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="64" id="NP7-P2-Qga">
                         <font key="font" metaFont="smallSystem"/>
                     </stepperCell>
                     <accessibility description="Storage Width"/>
@@ -477,7 +477,7 @@ Custom allows for manual settings.</string>
                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="fVv-0N-MQB">
                         <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="6jd-2b-RPM"/>
                         <font key="font" metaFont="smallSystem"/>
-                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                     <accessibility description="Storage Width"/>
@@ -507,7 +507,7 @@ Custom allows for manual settings.</string>
                         <binding destination="-2" name="textColor" keyPath="self.labelColor" id="MVb-7T-IbY"/>
                     </connections>
                 </textField>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uqQ-uA-3xF">
+                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="20" translatesAutoresizingMaskIntoConstraints="NO" id="uqQ-uA-3xF">
                     <rect key="frame" x="173" y="303" width="10" height="14"/>
                     <textFieldCell key="cell" controlSize="small" enabled="NO" sendsActionOnEndEditing="YES" alignment="right" title="x" id="hN1-S9-zl8">
                         <font key="font" metaFont="smallSystem"/>
@@ -516,7 +516,7 @@ Custom allows for manual settings.</string>
                     </textFieldCell>
                     <accessibility description=" "/>
                 </textField>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IVk-ye-fOe">
+                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="20" translatesAutoresizingMaskIntoConstraints="NO" id="IVk-ye-fOe">
                     <rect key="frame" x="161" y="249" width="10" height="14"/>
                     <textFieldCell key="cell" controlSize="small" enabled="NO" sendsActionOnEndEditing="YES" alignment="right" title="x" id="uuL-JR-73C">
                         <font key="font" metaFont="smallSystem"/>
@@ -524,7 +524,7 @@ Custom allows for manual settings.</string>
                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                 </textField>
-                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="sKT-h2-mAF">
+                <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="20" translatesAutoresizingMaskIntoConstraints="NO" id="sKT-h2-mAF">
                     <rect key="frame" x="161" y="222" width="10" height="14"/>
                     <textFieldCell key="cell" controlSize="small" enabled="NO" sendsActionOnEndEditing="YES" alignment="right" title="x" id="cNr-IZ-H9j">
                         <font key="font" metaFont="smallSystem"/>
@@ -611,7 +611,7 @@ Custom allows manually setting all parameters. Useful for correcting an incorrec
                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="ZHl-Y5-C5P">
                         <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Ts7-R5-Oye"/>
                         <font key="font" metaFont="smallSystem"/>
-                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                     <accessibility description="Storage Height"/>
@@ -639,7 +639,7 @@ Custom allows manually setting all parameters. Useful for correcting an incorrec
                     <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="QSZ-2r-Ydl">
                         <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="Tzx-xq-0zo"/>
                         <font key="font" metaFont="smallSystem"/>
-                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                     <accessibility description="Pixel Aspect Ratio Denominator"/>
@@ -655,7 +655,7 @@ Custom allows manually setting all parameters. Useful for correcting an incorrec
                 </textField>
                 <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2s0-5k-fjU">
                     <rect key="frame" x="242" y="298" width="15" height="22"/>
-                    <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="59" id="MwK-aS-Oaf">
+                    <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="64" id="MwK-aS-Oaf">
                         <font key="font" metaFont="smallSystem"/>
                     </stepperCell>
                     <accessibility description="Storage Height"/>
diff --git a/macosx/Base.lproj/HBPlayerHUDController.xib b/macosx/Base.lproj/HBPlayerHUDController.xib
index da2013c38..9d095abb2 100644
--- a/macosx/Base.lproj/HBPlayerHUDController.xib
+++ b/macosx/Base.lproj/HBPlayerHUDController.xib
@@ -1,9 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11762" systemVersion="16C67" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <development version="7000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11762"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
+        <capability name="Alignment constraints to the first baseline" minToolsVersion="6.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="HBPlayerHUDController">
@@ -23,19 +24,21 @@
             <rect key="frame" x="0.0" y="0.0" width="460" height="100"/>
             <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
-                <slider toolTip="Drag to change timeline position." verticalHuggingPriority="750" id="lBp-JT-ehn">
-                    <rect key="frame" x="69" y="18" width="322" height="17"/>
-                    <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
+                <slider toolTip="Drag to change timeline position." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lBp-JT-ehn">
+                    <rect key="frame" x="69" y="19" width="322" height="15"/>
                     <sliderCell key="cell" controlSize="small" continuous="YES" alignment="left" maxValue="100" tickMarkPosition="above" sliderType="linear" id="mMk-re-3u5"/>
                     <accessibility description="Timeline"/>
                     <connections>
                         <action selector="sliderChanged:" target="-2" id="YM4-mh-fr5"/>
                     </connections>
                 </slider>
-                <button toolTip="Toggle Play/Pause" id="mLA-ei-4sK">
+                <button toolTip="Toggle Play/Pause" translatesAutoresizingMaskIntoConstraints="NO" id="mLA-ei-4sK">
                     <rect key="frame" x="212" y="46" width="36" height="36"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="PlayTemplate" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" id="jG9-2O-OES">
+                    <constraints>
+                        <constraint firstAttribute="height" constant="36" id="X8s-nz-Azm"/>
+                        <constraint firstAttribute="width" constant="36" id="mCt-hw-6Cl"/>
+                    </constraints>
+                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="PlayTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyDown" id="jG9-2O-OES">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
@@ -44,10 +47,13 @@
                         <action selector="playPauseToggle:" target="-2" id="LLB-0k-P6K"/>
                     </connections>
                 </button>
-                <button toolTip="Go To Beginning" id="WuP-9l-8AN">
+                <button toolTip="Go To Beginning" translatesAutoresizingMaskIntoConstraints="NO" id="WuP-9l-8AN">
                     <rect key="frame" x="170" y="51" width="32" height="26"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="PrevTemplate" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" id="IBZ-MN-bJO">
+                    <constraints>
+                        <constraint firstAttribute="height" constant="26" id="LYj-zA-LDX"/>
+                        <constraint firstAttribute="width" constant="32" id="uKO-gw-ffy"/>
+                    </constraints>
+                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="PrevTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyDown" id="IBZ-MN-bJO">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
@@ -56,9 +62,12 @@
                         <action selector="goToBeginning:" target="-2" id="m24-WZ-vGD"/>
                     </connections>
                 </button>
-                <button toolTip="Go To End" id="CQ0-pk-SFk">
+                <button toolTip="Go To End" translatesAutoresizingMaskIntoConstraints="NO" id="CQ0-pk-SFk">
                     <rect key="frame" x="258" y="51" width="32" height="26"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <constraints>
+                        <constraint firstAttribute="height" constant="26" id="QM8-Iv-2Dj"/>
+                        <constraint firstAttribute="width" constant="32" id="phm-QW-jOq"/>
+                    </constraints>
                     <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NextTemplate" imagePosition="only" alignment="center" controlSize="mini" imageScaling="proportionallyDown" id="LUb-dY-8hG">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="miniSystem"/>
@@ -68,9 +77,8 @@
                         <action selector="goToEnd:" target="-2" id="Rp0-53-4gw"/>
                     </connections>
                 </button>
-                <textField toolTip="Time remaining." verticalHuggingPriority="750" id="PVD-pq-1ZG">
-                    <rect key="frame" x="395" y="20" width="55" height="14"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                <textField toolTip="Time remaining." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="PVD-pq-1ZG">
+                    <rect key="frame" x="397" y="20" width="53" height="14"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="00:00:00" id="6A0-9h-5UY">
                         <font key="font" metaFont="smallSystem"/>
                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -78,9 +86,8 @@
                     </textFieldCell>
                     <accessibility description="Time Remaining"/>
                 </textField>
-                <textField toolTip="Current timeline position." verticalHuggingPriority="750" id="uYx-2C-8et">
-                    <rect key="frame" x="10" y="20" width="55" height="14"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                <textField toolTip="Current timeline position." verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="uYx-2C-8et">
+                    <rect key="frame" x="10" y="20" width="53" height="14"/>
                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="00:00:00" id="dGi-LK-P1E">
                         <font key="font" metaFont="smallSystem"/>
                         <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
@@ -88,18 +95,19 @@
                     </textFieldCell>
                     <accessibility description="Current Timeline Position"/>
                 </textField>
-                <slider toolTip="Drag to change volume." verticalHuggingPriority="750" id="gzA-no-jdv">
-                    <rect key="frame" x="34" y="55" width="65" height="17"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                <slider toolTip="Drag to change volume." verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="gzA-no-jdv">
+                    <rect key="frame" x="34" y="56" width="65" height="15"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="65" id="bu2-Fj-XwN"/>
+                    </constraints>
                     <sliderCell key="cell" controlSize="small" continuous="YES" state="on" alignment="left" maxValue="1" doubleValue="1" tickMarkPosition="above" sliderType="linear" id="aQz-j6-bQi"/>
                     <accessibility description="Volume Control"/>
                     <connections>
                         <action selector="volumeSliderChanged:" target="-2" id="rLr-Ug-i8q"/>
                     </connections>
                 </slider>
-                <button toolTip="Exit player and return to still image previews." id="84p-08-fGK" userLabel="Stop Button">
-                    <rect key="frame" x="424" y="55" width="16" height="16"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                <button toolTip="Exit player and return to still image previews." translatesAutoresizingMaskIntoConstraints="NO" id="84p-08-fGK" userLabel="Stop Button">
+                    <rect key="frame" x="426" y="56" width="14" height="15"/>
                     <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="NSStopProgressFreestandingTemplate" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" id="hWC-BU-ynp">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
@@ -109,10 +117,13 @@
                         <action selector="showPicturesPreview:" target="-2" id="kCs-UI-Epb"/>
                     </connections>
                 </button>
-                <button toolTip="Mute Volume" id="euL-Tg-dmT">
+                <button toolTip="Mute Volume" translatesAutoresizingMaskIntoConstraints="NO" id="euL-Tg-dmT">
                     <rect key="frame" x="12" y="55" width="18" height="18"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="volLowTemplate" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" id="njB-22-thn">
+                    <constraints>
+                        <constraint firstAttribute="width" constant="18" id="T8H-oI-ZPM"/>
+                        <constraint firstAttribute="height" constant="18" id="gbJ-wm-eO2"/>
+                    </constraints>
+                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="volLowTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyDown" id="njB-22-thn">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
@@ -121,10 +132,13 @@
                         <action selector="mute:" target="-2" id="CIm-ce-Lnf"/>
                     </connections>
                 </button>
-                <button toolTip="Full Volume" id="Kiv-cL-wYI">
+                <button toolTip="Full Volume" translatesAutoresizingMaskIntoConstraints="NO" id="Kiv-cL-wYI">
                     <rect key="frame" x="103" y="55" width="18" height="18"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="volHighTemplate" imagePosition="overlaps" alignment="center" imageScaling="proportionallyDown" id="rgx-mB-Rva">
+                    <constraints>
+                        <constraint firstAttribute="width" constant="18" id="BMZ-v1-tgu"/>
+                        <constraint firstAttribute="height" constant="18" id="kB7-1B-FDd"/>
+                    </constraints>
+                    <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="volHighTemplate" imagePosition="only" alignment="center" imageScaling="proportionallyDown" id="rgx-mB-Rva">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
@@ -133,9 +147,11 @@
                         <action selector="maxVolume:" target="-2" id="89B-BN-U8S"/>
                     </connections>
                 </button>
-                <popUpButton toolTip="Enable or disable tracks." id="Vj1-Za-AUV">
-                    <rect key="frame" x="336" y="47" width="73" height="30"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                <popUpButton toolTip="Enable or disable tracks." translatesAutoresizingMaskIntoConstraints="NO" id="Vj1-Za-AUV">
+                    <rect key="frame" x="335" y="53" width="74" height="20"/>
+                    <constraints>
+                        <constraint firstAttribute="width" constant="68" id="5FX-cP-Cps"/>
+                    </constraints>
                     <popUpButtonCell key="cell" type="push" title="Tracks" bezelStyle="rounded" alignment="left" controlSize="small" lineBreakMode="truncatingTail" state="on" borderStyle="border" tag="1" imageScaling="proportionallyDown" inset="2" pullsDown="YES" autoenablesItems="NO" altersStateOfSelectedItem="NO" id="uwd-kr-YUM">
                         <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                         <font key="font" metaFont="smallSystem"/>
@@ -150,7 +166,35 @@
                     <accessibility description="Tracks Selection"/>
                 </popUpButton>
             </subviews>
-            <point key="canvasLocation" x="73" y="25"/>
+            <constraints>
+                <constraint firstItem="lBp-JT-ehn" firstAttribute="centerY" secondItem="uYx-2C-8et" secondAttribute="centerY" id="0Ae-58-HZk"/>
+                <constraint firstItem="mLA-ei-4sK" firstAttribute="centerY" secondItem="CQ0-pk-SFk" secondAttribute="centerY" id="5iK-al-YML"/>
+                <constraint firstAttribute="trailing" secondItem="PVD-pq-1ZG" secondAttribute="trailing" constant="12" id="6dk-cb-v2e"/>
+                <constraint firstItem="WuP-9l-8AN" firstAttribute="leading" secondItem="Kiv-cL-wYI" secondAttribute="trailing" constant="49" id="79A-5g-U7Q"/>
+                <constraint firstAttribute="bottom" secondItem="PVD-pq-1ZG" secondAttribute="bottom" constant="20" id="9cE-Nk-kcB"/>
+                <constraint firstItem="uYx-2C-8et" firstAttribute="leading" secondItem="xT7-Bx-eCV" secondAttribute="leading" constant="12" id="EmN-mc-qMr"/>
+                <constraint firstItem="lBp-JT-ehn" firstAttribute="leading" secondItem="uYx-2C-8et" secondAttribute="trailing" constant="8" id="Grx-ac-rC2"/>
+                <constraint firstItem="84p-08-fGK" firstAttribute="firstBaseline" secondItem="Vj1-Za-AUV" secondAttribute="firstBaseline" id="H0w-KP-ye3"/>
+                <constraint firstItem="euL-Tg-dmT" firstAttribute="centerY" secondItem="gzA-no-jdv" secondAttribute="centerY" id="HTx-V5-2xM"/>
+                <constraint firstItem="euL-Tg-dmT" firstAttribute="top" secondItem="xT7-Bx-eCV" secondAttribute="top" constant="27" id="K07-g0-aA4"/>
+                <constraint firstItem="Vj1-Za-AUV" firstAttribute="leading" secondItem="CQ0-pk-SFk" secondAttribute="trailing" constant="48" id="KlG-3j-Fev"/>
+                <constraint firstItem="WuP-9l-8AN" firstAttribute="centerY" secondItem="mLA-ei-4sK" secondAttribute="centerY" id="Q4l-43-xPh"/>
+                <constraint firstAttribute="trailing" secondItem="84p-08-fGK" secondAttribute="trailing" constant="20" id="VH0-gL-7T0"/>
+                <constraint firstItem="Kiv-cL-wYI" firstAttribute="centerY" secondItem="WuP-9l-8AN" secondAttribute="centerY" id="Vqw-sb-0Co"/>
+                <constraint firstItem="lBp-JT-ehn" firstAttribute="centerY" secondItem="PVD-pq-1ZG" secondAttribute="centerY" id="b7z-6O-9eC"/>
+                <constraint firstItem="mLA-ei-4sK" firstAttribute="leading" secondItem="WuP-9l-8AN" secondAttribute="trailing" constant="10" id="cPY-cs-tor"/>
+                <constraint firstItem="PVD-pq-1ZG" firstAttribute="leading" secondItem="lBp-JT-ehn" secondAttribute="trailing" constant="8" id="eye-Bl-wmu"/>
+                <constraint firstItem="CQ0-pk-SFk" firstAttribute="centerY" secondItem="Vj1-Za-AUV" secondAttribute="centerY" id="fcb-yb-zym"/>
+                <constraint firstItem="CQ0-pk-SFk" firstAttribute="leading" secondItem="mLA-ei-4sK" secondAttribute="trailing" constant="10" id="fnn-T8-f6u"/>
+                <constraint firstItem="gzA-no-jdv" firstAttribute="centerY" secondItem="Kiv-cL-wYI" secondAttribute="centerY" id="ipl-TU-6il"/>
+                <constraint firstAttribute="bottom" secondItem="uYx-2C-8et" secondAttribute="bottom" constant="20" id="lVk-4b-i7C"/>
+                <constraint firstItem="84p-08-fGK" firstAttribute="leading" secondItem="Vj1-Za-AUV" secondAttribute="trailing" constant="20" id="leh-vT-GXl"/>
+                <constraint firstItem="Kiv-cL-wYI" firstAttribute="leading" secondItem="gzA-no-jdv" secondAttribute="trailing" constant="4" id="n5u-wZ-juV"/>
+                <constraint firstItem="84p-08-fGK" firstAttribute="top" secondItem="xT7-Bx-eCV" secondAttribute="top" constant="29" id="skk-2D-f35"/>
+                <constraint firstItem="gzA-no-jdv" firstAttribute="leading" secondItem="euL-Tg-dmT" secondAttribute="trailing" constant="4" id="vyV-Ai-ba8"/>
+                <constraint firstItem="euL-Tg-dmT" firstAttribute="leading" secondItem="xT7-Bx-eCV" secondAttribute="leading" constant="12" id="z5G-Dw-ebP"/>
+            </constraints>
+            <point key="canvasLocation" x="113" y="153"/>
         </customView>
     </objects>
     <resources>
diff --git a/macosx/Base.lproj/HBPreviewViewController.xib b/macosx/Base.lproj/HBPreviewViewController.xib
index bfc74d7d7..8c6f30a43 100644
--- a/macosx/Base.lproj/HBPreviewViewController.xib
+++ b/macosx/Base.lproj/HBPreviewViewController.xib
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <development version="8000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -70,7 +69,7 @@
                 <constraint firstItem="Fn2-om-hEi" firstAttribute="centerX" secondItem="Hz6-mo-xeY" secondAttribute="centerX" id="1DU-Zn-HTj"/>
                 <constraint firstAttribute="bottom" secondItem="Fn2-om-hEi" secondAttribute="bottom" constant="40" id="M3h-dq-YzY"/>
             </constraints>
-            <point key="canvasLocation" x="-376" y="-8"/>
+            <point key="canvasLocation" x="147" y="1"/>
         </customView>
     </objects>
 </document>
diff --git a/macosx/Base.lproj/HBSummaryViewController.xib b/macosx/Base.lproj/HBSummaryViewController.xib
index f1922f3a0..007a5d136 100644
--- a/macosx/Base.lproj/HBSummaryViewController.xib
+++ b/macosx/Base.lproj/HBSummaryViewController.xib
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <development version="8000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -113,7 +112,7 @@
                     </connections>
                 </textField>
                 <customView wantsLayer="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m5a-0z-QQ4">
-                    <rect key="frame" x="295" y="16" width="556" height="334"/>
+                    <rect key="frame" x="287" y="16" width="564" height="334"/>
                     <accessibility description="Preview"/>
                 </customView>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" preferredMaxLayoutWidth="100" translatesAutoresizingMaskIntoConstraints="NO" id="Jgq-K8-z3W" userLabel="Size">
@@ -140,10 +139,10 @@
                     </connections>
                 </textField>
                 <customView translatesAutoresizingMaskIntoConstraints="NO" id="9OK-03-grs">
-                    <rect key="frame" x="69" y="281" width="114" height="48"/>
+                    <rect key="frame" x="69" y="281" width="210" height="48"/>
                     <subviews>
                         <button translatesAutoresizingMaskIntoConstraints="NO" id="lUi-Oc-208">
-                            <rect key="frame" x="-3" y="33" width="109" height="18"/>
+                            <rect key="frame" x="-3" y="33" width="205" height="18"/>
                             <string key="toolTip">Optimize MP4 for progressive download. After encoding, data is reorganized and rewritten to allow immediate playback over a network, without needing to download the entire file.</string>
                             <buttonCell key="cell" type="check" title="Web Optimized" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="wcc-5d-Dgj">
                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -164,7 +163,7 @@
                             </connections>
                         </button>
                         <button translatesAutoresizingMaskIntoConstraints="NO" id="QKv-GR-d2g">
-                            <rect key="frame" x="-3" y="-3" width="109" height="18"/>
+                            <rect key="frame" x="-3" y="-3" width="205" height="18"/>
                             <string key="toolTip">Add a special MP4 marker to allow playback on vintage iPod 5th Generation devices circa 2006. Other settings may affect compatibility.</string>
                             <buttonCell key="cell" type="check" title="iPod 5G Support" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="zz5-qY-GSA">
                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -185,7 +184,7 @@
                             </connections>
                         </button>
                         <button translatesAutoresizingMaskIntoConstraints="NO" id="fPv-Vw-I89">
-                            <rect key="frame" x="-3" y="15" width="109" height="18"/>
+                            <rect key="frame" x="-3" y="15" width="205" height="18"/>
                             <string key="toolTip">Aligns the initial timestamps of all audio and video streams by inserting blank frames or dropping frames. May improve audio/video sync for broken players that do not honor MP4 edit lists.</string>
                             <buttonCell key="cell" type="check" title="Align A/V Start" bezelStyle="regularSquare" imagePosition="left" alignment="left" controlSize="small" inset="2" id="De0-Je-MAm">
                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -235,7 +234,7 @@
                 <constraint firstItem="GCn-2c-Fql" firstAttribute="width" secondItem="bpr-UY-4al" secondAttribute="width" id="HE8-Du-yhU"/>
                 <constraint firstItem="txV-1R-WoD" firstAttribute="leading" secondItem="bpr-UY-4al" secondAttribute="trailing" constant="8" symbolic="YES" id="I9H-1U-iqt"/>
                 <constraint firstItem="BHq-Mt-3eA" firstAttribute="top" secondItem="yRE-5c-FhX" secondAttribute="bottom" constant="16" id="IVl-m1-yLo"/>
-                <constraint firstItem="m5a-0z-QQ4" firstAttribute="leading" secondItem="yRE-5c-FhX" secondAttribute="trailing" constant="16" id="J92-rN-Hgk"/>
+                <constraint firstItem="m5a-0z-QQ4" firstAttribute="leading" secondItem="yRE-5c-FhX" secondAttribute="trailing" constant="8" symbolic="YES" id="J92-rN-Hgk"/>
                 <constraint firstItem="9OK-03-grs" firstAttribute="top" secondItem="txV-1R-WoD" secondAttribute="bottom" constant="6" id="MgV-fX-yfE"/>
                 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Jaw-pH-rhf" secondAttribute="trailing" constant="20" symbolic="YES" id="Ndp-Pa-1Wq"/>
                 <constraint firstItem="yRE-5c-FhX" firstAttribute="leading" secondItem="GCn-2c-Fql" secondAttribute="trailing" constant="8" id="Ok2-zj-HHS"/>
@@ -251,7 +250,7 @@
                 <constraint firstItem="Jgq-K8-z3W" firstAttribute="top" secondItem="Jaw-pH-rhf" secondAttribute="top" id="l2y-8G-v9J"/>
                 <constraint firstItem="0kh-Uy-Yo3" firstAttribute="top" secondItem="BHq-Mt-3eA" secondAttribute="top" id="nwz-Xj-cMt"/>
                 <constraint firstItem="Jgq-K8-z3W" firstAttribute="leading" secondItem="bpr-UY-4al" secondAttribute="leading" id="ogm-2d-HB7"/>
-                <constraint firstItem="m5a-0z-QQ4" firstAttribute="leading" secondItem="9OK-03-grs" secondAttribute="trailing" constant="112" id="onT-fu-ioj"/>
+                <constraint firstItem="m5a-0z-QQ4" firstAttribute="leading" secondItem="9OK-03-grs" secondAttribute="trailing" constant="8" symbolic="YES" id="onT-fu-ioj"/>
                 <constraint firstItem="bpr-UY-4al" firstAttribute="leading" secondItem="Hz6-mo-xeY" secondAttribute="leading" constant="20" id="ptr-Mh-cla"/>
                 <constraint firstItem="Jaw-pH-rhf" firstAttribute="width" secondItem="yRE-5c-FhX" secondAttribute="width" id="tyw-5Q-kCp"/>
                 <constraint firstItem="GCn-2c-Fql" firstAttribute="leading" secondItem="bpr-UY-4al" secondAttribute="leading" id="utH-I5-f9B"/>
diff --git a/macosx/Base.lproj/HBTitleSelection.xib b/macosx/Base.lproj/HBTitleSelection.xib
index 0185c1d7b..cf4089989 100644
--- a/macosx/Base.lproj/HBTitleSelection.xib
+++ b/macosx/Base.lproj/HBTitleSelection.xib
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13122.17" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <development version="8000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13122.17"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -20,7 +19,7 @@
         </arrayController>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" oneShot="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="HBTitleSelectionWindow" animationBehavior="default" id="F0z-JX-Cv5">
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" restorable="NO" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="HBTitleSelectionWindow" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="196" y="240" width="554" height="250"/>
@@ -30,7 +29,7 @@
                 <rect key="frame" x="0.0" y="0.0" width="554" height="250"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
-                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5Jw-On-iU3">
+                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="6000" translatesAutoresizingMaskIntoConstraints="NO" id="5Jw-On-iU3">
                         <rect key="frame" x="18" y="216" width="518" height="14"/>
                         <textFieldCell key="cell" controlSize="small" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Select the titles to add to the queue:" id="5tD-fg-g4t">
                             <font key="font" metaFont="smallSystemBold"/>
diff --git a/macosx/Base.lproj/PictureSettings.xib b/macosx/Base.lproj/PictureSettings.xib
index dccbacc02..ad88c867b 100644
--- a/macosx/Base.lproj/PictureSettings.xib
+++ b/macosx/Base.lproj/PictureSettings.xib
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14113" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
     <dependencies>
         <deployment identifier="macosx"/>
-        <development version="8000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14113"/>
-        <capability name="box content view" minToolsVersion="7.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -20,7 +18,7 @@
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <window title="Picture" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" showsToolbarButton="NO" visibleAtLaunch="NO" frameAutosaveName="PictureSizing" animationBehavior="default" id="5" userLabel="PicturePanel" customClass="NSPanel">
+        <window title="Picture" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" hidesOnDeactivate="YES" releasedWhenClosed="NO" visibleAtLaunch="NO" frameAutosaveName="PictureSizing" animationBehavior="default" id="5" userLabel="PicturePanel" customClass="NSPanel">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" utility="YES" HUD="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="152" y="1024" width="648" height="148"/>
@@ -78,7 +76,7 @@
                                     <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="441">
                                         <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="14I-lw-kIN"/>
                                         <font key="font" metaFont="miniSystem"/>
-                                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                     <connections>
@@ -102,7 +100,7 @@
                                     <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="443">
                                         <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="t04-vN-OL7"/>
                                         <font key="font" metaFont="miniSystem"/>
-                                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                     <connections>
@@ -155,7 +153,7 @@
                                 <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="44">
                                     <rect key="frame" x="143" y="103" width="15" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="64" id="169">
+                                    <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="59" id="169">
                                         <font key="font" metaFont="smallSystem"/>
                                     </stepperCell>
                                     <connections>
@@ -188,7 +186,7 @@
                                     <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="167">
                                         <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="le0-iC-NhW"/>
                                         <font key="font" metaFont="miniSystem"/>
-                                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                     <connections>
@@ -203,7 +201,7 @@
                                 <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" id="46">
                                     <rect key="frame" x="143" y="78" width="15" height="22"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                    <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="59" id="171">
+                                    <stepperCell key="cell" controlSize="small" continuous="YES" alignment="left" increment="16" minValue="64" maxValue="59" doubleValue="64" id="171">
                                         <font key="font" metaFont="smallSystem"/>
                                     </stepperCell>
                                     <connections>
@@ -220,8 +218,8 @@
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="41">
-                                    <rect key="frame" x="29" y="82" width="43" height="14"/>
+                                <textField verticalHuggingPriority="750" misplaced="YES" allowsCharacterPickerTouchBarItem="YES" id="41">
+                                    <rect key="frame" x="-1" y="82" width="73" height="14"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Height:" id="166">
                                         <font key="font" metaFont="smallSystem"/>
@@ -257,8 +255,8 @@
                                         <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="47">
-                                    <rect key="frame" x="32" y="108" width="38" height="14"/>
+                                <textField verticalHuggingPriority="750" misplaced="YES" allowsCharacterPickerTouchBarItem="YES" id="47">
+                                    <rect key="frame" x="-1" y="108" width="71" height="14"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="right" title="Width:" id="172">
                                         <font key="font" metaFont="smallSystem"/>
@@ -272,7 +270,7 @@
                                     <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="168">
                                         <numberFormatter key="formatter" formatterBehavior="default10_4" localizesFormat="NO" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="9iU-HJ-b4u"/>
                                         <font key="font" metaFont="miniSystem"/>
-                                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                     <connections>
@@ -302,7 +300,7 @@
                                     <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="397">
                                         <numberFormatter key="formatter" formatterBehavior="default10_4" usesGroupingSeparator="NO" minimumIntegerDigits="0" maximumIntegerDigits="42" id="nQn-4z-uRG"/>
                                         <font key="font" metaFont="miniSystem"/>
-                                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                     <connections>
@@ -404,7 +402,7 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="153">
                                         <font key="font" metaFont="miniSystem"/>
-                                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                     <connections>
@@ -426,7 +424,7 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="150">
                                         <font key="font" metaFont="miniSystem"/>
-                                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                     <connections>
@@ -464,7 +462,7 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="151">
                                         <font key="font" metaFont="miniSystem"/>
-                                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                     <connections>
@@ -511,7 +509,7 @@
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                     <textFieldCell key="cell" controlSize="mini" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" alignment="left" drawsBackground="YES" id="149">
                                         <font key="font" metaFont="miniSystem"/>
-                                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                     <connections>
diff --git a/macosx/Base.lproj/Queue.xib b/macosx/Base.lproj/Queue.xib
index bd0d185c3..d4602c9ee 100644
--- a/macosx/Base.lproj/Queue.xib
+++ b/macosx/Base.lproj/Queue.xib
@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14111" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <development version="8000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14111"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -22,15 +21,14 @@
             <windowCollectionBehavior key="collectionBehavior" fullScreenPrimary="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
             <rect key="contentRect" x="157" y="863" width="574" height="423"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1418"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1417"/>
             <value key="minSize" type="size" width="525" height="340"/>
             <view key="contentView" id="2577">
                 <rect key="frame" x="0.0" y="0.0" width="574" height="423"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
-                    <scrollView horizontalLineScroll="19" horizontalPageScroll="0.0" verticalLineScroll="19" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="2596">
+                    <scrollView horizontalLineScroll="19" horizontalPageScroll="0.0" verticalLineScroll="19" verticalPageScroll="0.0" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2596">
                         <rect key="frame" x="20" y="20" width="534" height="338"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <clipView key="contentView" id="B5m-TR-ErO">
                             <rect key="frame" x="1" y="1" width="532" height="336"/>
                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -93,18 +91,19 @@
                             <autoresizingMask key="autoresizingMask"/>
                         </scroller>
                     </scrollView>
-                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="2511">
-                        <rect key="frame" x="17" y="399" width="540" height="14"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMinY="YES"/>
+                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="6000" translatesAutoresizingMaskIntoConstraints="NO" id="2511">
+                        <rect key="frame" x="18" y="399" width="538" height="14"/>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" title="Pending Jobs" id="2637">
                             <font key="font" metaFont="smallSystem"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                             <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                         </textFieldCell>
                     </textField>
-                    <textField verticalHuggingPriority="750" allowsCharacterPickerTouchBarItem="YES" id="2646">
-                        <rect key="frame" x="17" y="366" width="540" height="29"/>
-                        <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                    <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" allowsCharacterPickerTouchBarItem="YES" preferredMaxLayoutWidth="6000" translatesAutoresizingMaskIntoConstraints="NO" id="2646">
+                        <rect key="frame" x="18" y="366" width="538" height="29"/>
+                        <constraints>
+                            <constraint firstAttribute="height" constant="29" id="IvQ-56-oOt"/>
+                        </constraints>
                         <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="There are no jobs currently encoding" id="2647">
                             <font key="font" metaFont="smallSystem"/>
                             <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -112,6 +111,18 @@
                         </textFieldCell>
                     </textField>
                 </subviews>
+                <constraints>
+                    <constraint firstItem="2511" firstAttribute="leading" secondItem="2577" secondAttribute="leading" constant="20" id="8Xc-AN-fPc"/>
+                    <constraint firstAttribute="trailing" secondItem="2511" secondAttribute="trailing" constant="20" id="Eu0-GV-JYK"/>
+                    <constraint firstItem="2596" firstAttribute="leading" secondItem="2577" secondAttribute="leading" constant="20" id="F6K-w4-dhC"/>
+                    <constraint firstAttribute="trailing" secondItem="2646" secondAttribute="trailing" constant="20" id="QhH-jG-52I"/>
+                    <constraint firstItem="2646" firstAttribute="top" secondItem="2511" secondAttribute="bottom" constant="4" id="agE-FW-5eL"/>
+                    <constraint firstAttribute="bottom" secondItem="2596" secondAttribute="bottom" constant="20" id="agY-QN-MrH"/>
+                    <constraint firstAttribute="trailing" secondItem="2596" secondAttribute="trailing" constant="20" id="cPs-nV-8Hz"/>
+                    <constraint firstItem="2596" firstAttribute="top" secondItem="2646" secondAttribute="bottom" constant="8" id="lUS-mr-e51"/>
+                    <constraint firstItem="2511" firstAttribute="top" secondItem="2577" secondAttribute="top" constant="10" id="q87-Mh-5mE"/>
+                    <constraint firstItem="2646" firstAttribute="leading" secondItem="2577" secondAttribute="leading" constant="20" id="r9l-aI-qMG"/>
+                </constraints>
             </view>
             <toolbar key="toolbar" implicitIdentifier="0FE76B40-49B7-48AE-B44E-D1B8034BC88A" explicitIdentifier="HBQueueToolbar" displayMode="iconAndLabel" sizeMode="regular" id="ZVb-ld-0UP">
                 <allowedToolbarItems>
@@ -163,7 +174,7 @@
             <connections>
                 <outlet property="delegate" destination="-2" id="2579"/>
             </connections>
-            <point key="canvasLocation" x="91" y="295"/>
+            <point key="canvasLocation" x="114" y="263"/>
         </window>
         <menu id="2649" userLabel="ContextMenu">
             <items>
diff --git a/macosx/Base.lproj/Video.xib b/macosx/Base.lproj/Video.xib
index f1e60dfdb..5a3de6f80 100644
--- a/macosx/Base.lproj/Video.xib
+++ b/macosx/Base.lproj/Video.xib
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="13770" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14269.12" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <development version="8000" identifier="xcode"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13770"/>
-        <capability name="box content view" minToolsVersion="7.0"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14269.12"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -50,7 +48,7 @@
                             <real key="minimum" value="0.0"/>
                         </numberFormatter>
                         <font key="font" metaFont="smallSystem"/>
-                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                     <connections>
@@ -272,7 +270,7 @@ Average Bitrate varies quality to ensure the data rate remains relatively consis
                     </connections>
                 </matrix>
                 <matrix verticalHuggingPriority="750" allowsEmptySelection="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xe2-d5-nEH">
-                    <rect key="frame" x="117" y="209" width="143" height="38"/>
+                    <rect key="frame" x="117" y="209" width="180" height="38"/>
                     <string key="toolTip">Variable Framerate allows each frame to have its own duration, matching the source.
 
 Peak Framerate is the same as Variable Framerate and limited to the maximum set by Framerate (FPS). Useful for ensuring frame rate compatibility, regardless of the source.
@@ -280,10 +278,9 @@ Peak Framerate is the same as Variable Framerate and limited to the maximum set
 Constant Framerate forces all frames to be exactly the same duration, set by Framerate (FPS).</string>
                     <constraints>
                         <constraint firstAttribute="height" constant="38" id="9tE-25-ADr"/>
-                        <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="143" id="OIn-JQ-Mi8"/>
                     </constraints>
                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
-                    <size key="cellSize" width="143" height="18"/>
+                    <size key="cellSize" width="180" height="18"/>
                     <size key="intercellSpacing" width="4" height="2"/>
                     <buttonCell key="prototype" type="radio" title="Radio" imagePosition="left" alignment="left" inset="2" id="M9p-y9-GDo">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -371,6 +368,7 @@ x264 is lossless at RF 0.</string>
                 <constraint firstItem="bAn-iZ-ieF" firstAttribute="width" secondItem="rOd-nt-22T" secondAttribute="width" id="7bO-dm-xB0"/>
                 <constraint firstItem="Xe2-d5-nEH" firstAttribute="top" secondItem="9tc-EO-QMd" secondAttribute="bottom" constant="8" id="883-2F-hs6"/>
                 <constraint firstItem="lsD-0N-H8k" firstAttribute="leading" secondItem="gfa-Hb-cDP" secondAttribute="trailing" constant="8" id="9mN-Bk-FUt"/>
+                <constraint firstItem="gfa-Hb-cDP" firstAttribute="leading" secondItem="Xe2-d5-nEH" secondAttribute="trailing" constant="12" id="Af6-mG-j8Z"/>
                 <constraint firstItem="1au-ZO-l1i" firstAttribute="baseline" secondItem="gfa-Hb-cDP" secondAttribute="baseline" id="BfH-Qs-3mV"/>
                 <constraint firstItem="GPu-Ht-bKg" firstAttribute="leading" secondItem="gfa-Hb-cDP" secondAttribute="trailing" constant="36" id="D92-Pk-Eb2"/>
                 <constraint firstItem="A3o-Zx-OfM" firstAttribute="leading" secondItem="1au-ZO-l1i" secondAttribute="leading" id="F0a-Kc-s3X"/>
@@ -393,14 +391,16 @@ x264 is lossless at RF 0.</string>
                 <constraint firstItem="bnV-aE-FVh" firstAttribute="baseline" secondItem="olm-zg-k9Y" secondAttribute="baseline" id="gA6-nQ-o4p"/>
                 <constraint firstItem="rOd-nt-22T" firstAttribute="baseline" secondItem="xwK-Yu-a1e" secondAttribute="baseline" id="gSI-9O-c0a"/>
                 <constraint firstAttribute="bottom" secondItem="A4U-3F-pYq" secondAttribute="bottom" constant="20" symbolic="YES" id="hwA-f3-WWM"/>
+                <constraint firstItem="lsD-0N-H8k" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="9tc-EO-QMd" secondAttribute="trailing" constant="8" symbolic="YES" id="k1s-PG-fmj"/>
                 <constraint firstItem="olm-zg-k9Y" firstAttribute="top" secondItem="A3o-Zx-OfM" secondAttribute="bottom" constant="6" id="mJ5-rh-5HC"/>
                 <constraint firstAttribute="trailing" secondItem="GPu-Ht-bKg" secondAttribute="trailing" constant="20" id="sL1-if-zZ9"/>
                 <constraint firstItem="Pai-3Q-Gs3" firstAttribute="baseline" secondItem="1au-ZO-l1i" secondAttribute="baseline" id="sVB-mt-wYZ"/>
                 <constraint firstItem="Xe2-d5-nEH" firstAttribute="leading" secondItem="9tc-EO-QMd" secondAttribute="leading" id="vI1-l7-kWA"/>
                 <constraint firstItem="A4U-3F-pYq" firstAttribute="leading" secondItem="wAC-5p-nXb" secondAttribute="leading" id="xFf-rj-qaL"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Pai-3Q-Gs3" secondAttribute="trailing" constant="20" symbolic="YES" id="yJK-FI-8b5"/>
                 <constraint firstItem="A3o-Zx-OfM" firstAttribute="leading" secondItem="olm-zg-k9Y" secondAttribute="leading" id="ydG-Lc-8Ru"/>
             </constraints>
-            <point key="canvasLocation" x="198" y="151"/>
+            <point key="canvasLocation" x="225" y="71"/>
         </view>
         <customView id="2dX-Hf-Hxl" userLabel="x264/x264 presets view">
             <rect key="frame" x="0.0" y="0.0" width="920" height="204"/>
@@ -544,7 +544,7 @@ Syntax: option-1=foo:opt2=bar,baz</string>
                     </constraints>
                     <textFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="IID-yp-or8">
                         <font key="font" metaFont="smallSystem"/>
-                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                     <connections>
@@ -657,6 +657,7 @@ This setting is no longer supported and may be removed in a future version. Use
                 <constraint firstItem="mkM-81-g3d" firstAttribute="leading" secondItem="2dX-Hf-Hxl" secondAttribute="leading" constant="20" id="dRX-Dc-WbC"/>
                 <constraint firstItem="P7c-Zk-G99" firstAttribute="baseline" secondItem="BY1-IG-JvI" secondAttribute="baseline" id="di0-4c-Nqj"/>
                 <constraint firstItem="gzq-SL-YVY" firstAttribute="leading" secondItem="0sa-ep-yfr" secondAttribute="leading" id="ehu-8e-5ci"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="z7F-H2-Vfr" secondAttribute="trailing" constant="20" symbolic="YES" id="fHZ-Dm-Woa"/>
                 <constraint firstItem="Biw-5K-pPD" firstAttribute="width" secondItem="A7d-wM-Xmp" secondAttribute="width" id="fzL-Ib-VAe"/>
                 <constraint firstItem="CPP-lh-FbN" firstAttribute="leading" secondItem="dY9-5D-mXX" secondAttribute="trailing" constant="8" id="iXi-0D-sED"/>
                 <constraint firstItem="P7c-Zk-G99" firstAttribute="top" secondItem="CPP-lh-FbN" secondAttribute="bottom" constant="8" id="kDE-kd-szR"/>
@@ -666,9 +667,11 @@ This setting is no longer supported and may be removed in a future version. Use
                 <constraint firstItem="mkM-81-g3d" firstAttribute="baseline" secondItem="Zs7-1Y-50A" secondAttribute="baseline" id="omV-G5-hMn"/>
                 <constraint firstItem="Biw-5K-pPD" firstAttribute="width" secondItem="P7c-Zk-G99" secondAttribute="width" id="pJk-eY-1r2"/>
                 <constraint firstItem="Zs7-1Y-50A" firstAttribute="leading" secondItem="mkM-81-g3d" secondAttribute="trailing" constant="8" id="qe2-wu-PNj"/>
+                <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="Zs7-1Y-50A" secondAttribute="trailing" constant="20" symbolic="YES" id="riE-Nn-yRP"/>
                 <constraint firstItem="0sa-ep-yfr" firstAttribute="leading" secondItem="mkM-81-g3d" secondAttribute="leading" constant="40" id="sdR-pt-ls6"/>
                 <constraint firstItem="oJk-ur-wgc" firstAttribute="leading" secondItem="ijg-ux-uvb" secondAttribute="trailing" constant="8" id="wsw-IM-Ooe"/>
                 <constraint firstItem="0sa-ep-yfr" firstAttribute="width" secondItem="dY9-5D-mXX" secondAttribute="width" id="xvU-on-9bJ"/>
+                <constraint firstItem="ijg-ux-uvb" firstAttribute="leading" secondItem="P7c-Zk-G99" secondAttribute="trailing" constant="20" id="zKk-dV-w0d"/>
             </constraints>
             <point key="canvasLocation" x="51" y="477"/>
         </customView>
@@ -687,7 +690,7 @@ Syntax: option-1=foo:opt2=bar</string>
                     </constraints>
                     <textFieldCell key="cell" controlSize="small" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" state="on" borderStyle="bezel" drawsBackground="YES" id="z0u-VS-m0l">
                         <font key="font" metaFont="smallSystem"/>
-                        <color key="textColor" name="textColor" catalog="System" colorSpace="catalog"/>
+                        <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                     </textFieldCell>
                     <connections>
diff --git a/macosx/HBFilters+UIAdditions.m b/macosx/HBFilters+UIAdditions.m
index b143181dc..71ce759f8 100644
--- a/macosx/HBFilters+UIAdditions.m
+++ b/macosx/HBFilters+UIAdditions.m
@@ -19,7 +19,11 @@ static NSArray * filterParamsToNamesArray(hb_filter_param_t * (f)(int), int filt
 
     for (hb_filter_param_t *preset = f(filter_id); preset->name != NULL; preset++)
     {
-        [presets addObject:@(preset->name)];
+        NSString *name = @(preset->name);
+        if ([name isEqualToString:@"Off"]) {
+            name = NSLocalizedString(@"Off", @"HBFilters -> off display name");
+        }
+        [presets addObject:name];
     }
 
     return [presets copy];
@@ -37,7 +41,11 @@ static NSDictionary * filterParamsToNamesDict(hb_filter_param_t * (f)(int), int
 
     for (hb_filter_param_t *preset = f(filter_id); preset->name != NULL; preset++)
     {
-        [presets setObject:NSLocalizedString(@(preset->short_name), nil) forKey:@(preset->name)];
+        NSString *name = @(preset->name);
+        if ([name isEqualToString:@"Off"]) {
+            name = NSLocalizedString(@"Off", @"HBFilters -> off display name");
+        }
+        [presets setObject:@(preset->short_name) forKey:name];
     }
 
     return [presets copy];
diff --git a/macosx/HBSummaryViewController.m b/macosx/HBSummaryViewController.m
index e577e0210..453f31352 100644
--- a/macosx/HBSummaryViewController.m
+++ b/macosx/HBSummaryViewController.m
@@ -255,9 +255,9 @@ static void *HBSummaryViewControllerSubsContext = &HBSummaryViewControllerSubsCo
 
 - (void)resetLabels
 {
-    self.tracksLabel.stringValue = NSLocalizedString(@"", nil);
-    self.filtersLabel.stringValue = NSLocalizedString(@"", nil);
-    self.dimensionLabel.stringValue = NSLocalizedString(@"", nil);
+    self.tracksLabel.stringValue = @"";
+    self.filtersLabel.stringValue = @"";
+    self.dimensionLabel.stringValue = @"";
     self.tracksReloadInQueue = NO;
     self.filtersReloadInQueue = NO;
     self.pictureReloadInQueue = NO;
-- 
2.40.0