From e628d6e1e773acb11f0a4249fc36f7b4d3bf9bf0 Mon Sep 17 00:00:00 2001
From: Bob Voorneveld <bob.voorneveld@wearespindle.com>
Date: Mon, 21 Nov 2016 08:27:44 +0100
Subject: [PATCH] Small improvements on CallKit

---
 Example/Podfile.lock                          |   2 +-
 .../VialerSIPLib/Base.lproj/Main.storyboard   | 329 +++++++++---------
 .../VSLIncomingCallViewController.swift       |  78 +++--
 .../VSLSecondCallViewController.swift         |  28 +-
 .../VSLTransferCallViewController.swift       |  12 +-
 Pod/Classes/CallKitProviderDelegate.m         |   7 +-
 Pod/Classes/VSLAudioController.m              |   3 +
 Pod/Classes/VSLCall.m                         |   4 +-
 Pod/Classes/VSLCallManager.m                  |   4 +-
 9 files changed, 244 insertions(+), 223 deletions(-)

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
index 70388854..8880e46d 100644
--- a/Example/Podfile.lock
+++ b/Example/Podfile.lock
@@ -34,4 +34,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 0f7b04fb045caf39ed7c2486524959b2d2be90e8
 
-COCOAPODS: 1.1.1
+COCOAPODS: 1.2.0.beta.1
diff --git a/Example/VialerSIPLib/Base.lproj/Main.storyboard b/Example/VialerSIPLib/Base.lproj/Main.storyboard
index 5631af14..3eb89d46 100644
--- a/Example/VialerSIPLib/Base.lproj/Main.storyboard
+++ b/Example/VialerSIPLib/Base.lproj/Main.storyboard
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11201" systemVersion="16A323" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="SSt-lM-vHj">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="11542" systemVersion="16B2555" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="SSt-lM-vHj">
+    <device id="retina4_7" orientation="portrait">
+        <adaptation id="fullscreen"/>
+    </device>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11161"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="11524"/>
         <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -19,8 +22,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cpM-wE-TQc">
-                                <frame key="frameInset" minX="200" minY="329" width="200" height="42"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="cpM-wE-TQc">
+                                <rect key="frame" x="87.5" y="362.5" width="200" height="42"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="200" id="zAj-DJ-Ukd"/>
                                 </constraints>
@@ -30,12 +33,12 @@
                                     <action selector="registerAccountButtonPressed:" destination="AyF-vj-IOS" eventType="touchUpInside" id="KKm-1U-zcS"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Jbq-Ih-gWu">
-                                <frame key="frameInset" minX="200" minY="279" width="200" height="42"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jbq-Ih-gWu">
+                                <rect key="frame" x="87.5" y="312.5" width="200" height="42"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="793-jp-Dlg">
-                                <frame key="frameInset" minX="200" minY="229" width="200" height="42"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="793-jp-Dlg">
+                                <rect key="frame" x="87.5" y="262.5" width="200" height="42"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Make Call"/>
                                 <connections>
@@ -80,8 +83,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" tag="1" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sy1-Hn-wab">
-                                <frame key="frameInset" minX="179" minY="230" width="54" height="54"/>
+                            <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sy1-Hn-wab">
+                                <rect key="frame" x="66.5" y="297" width="54" height="54"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="Sy1-Hn-wab" secondAttribute="height" multiplier="1:1" id="1cG-oT-J07"/>
                                 </constraints>
@@ -91,88 +94,88 @@
                                     <action selector="keypadButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="302-XN-DFM"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="5" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tf8-MX-0Fg">
-                                <frame key="frameInset" minX="273" minY="304" width="54" height="54"/>
+                            <button opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Tf8-MX-0Fg">
+                                <rect key="frame" x="160.5" y="371" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="5"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="LO1-uV-95h"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="4" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GOX-TT-b8T">
-                                <frame key="frameInset" minX="179" minY="304" width="54" height="54"/>
+                            <button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="GOX-TT-b8T">
+                                <rect key="frame" x="66.5" y="371" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="4"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="OTl-L6-fTE"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="8" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pUO-JU-tup">
-                                <frame key="frameInset" minX="273" minY="378" width="54" height="54"/>
+                            <button opaque="NO" tag="8" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pUO-JU-tup">
+                                <rect key="frame" x="160.5" y="445" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="8"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="8zE-P9-oEX"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="9" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eFB-Kp-OAp">
-                                <frame key="frameInset" minX="367" minY="378" width="54" height="54"/>
+                            <button opaque="NO" tag="9" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="eFB-Kp-OAp">
+                                <rect key="frame" x="254.5" y="445" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="9"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="QVC-Oi-zGp"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="7" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mwA-Kd-c8g">
-                                <frame key="frameInset" minX="179" minY="378" width="54" height="54"/>
+                            <button opaque="NO" tag="7" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mwA-Kd-c8g">
+                                <rect key="frame" x="66.5" y="445" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="7"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="MPm-In-cfo"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="t4Q-ch-U79">
-                                <frame key="frameInset" minX="273" minY="452" width="54" height="54"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="t4Q-ch-U79">
+                                <rect key="frame" x="160.5" y="519" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="0"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="Jfv-v2-YeT"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="11" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kUh-5z-oAc">
-                                <frame key="frameInset" minX="367" minY="452" width="54" height="54"/>
+                            <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kUh-5z-oAc">
+                                <rect key="frame" x="254.5" y="519" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="#"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="LKl-1C-ZA7"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="10" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AmJ-VZ-fCu">
-                                <frame key="frameInset" minX="179" minY="452" width="54" height="54"/>
+                            <button opaque="NO" tag="10" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="AmJ-VZ-fCu">
+                                <rect key="frame" x="66.5" y="519" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="*"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="5HW-Qf-G8M"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="6" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xFp-ty-2GO">
-                                <frame key="frameInset" minX="367" minY="304" width="54" height="54"/>
+                            <button opaque="NO" tag="6" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xFp-ty-2GO">
+                                <rect key="frame" x="254.5" y="371" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="6"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="6Fi-vQ-tUW"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="3" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bK2-Yb-Do1">
-                                <frame key="frameInset" minX="367" minY="230" width="54" height="54"/>
+                            <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bK2-Yb-Do1">
+                                <rect key="frame" x="254.5" y="297" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="3"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="9Rv-QJ-ZDE"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="3" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bmF-pk-MBN">
-                                <frame key="frameInset" minX="530" minY="84" width="50" height="30"/>
+                            <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="bmF-pk-MBN">
+                                <rect key="frame" x="309" y="84" width="50" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="50" id="kCo-VB-PV8"/>
                                 </constraints>
@@ -182,30 +185,30 @@
                                     <action selector="deleteButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="qHh-Ac-ADa"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="2" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UdU-g0-UKm">
-                                <frame key="frameInset" minX="273" minY="230" width="54" height="54"/>
+                            <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UdU-g0-UKm">
+                                <rect key="frame" x="160.5" y="297" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="2"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="Caa-NY-uSB"/>
                                 </connections>
                             </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="number to dial" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z6J-4a-Xah">
-                                <frame key="frameInset" minX="74" minY="84" width="448" height="30"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="number to dial" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Z6J-4a-Xah">
+                                <rect key="frame" x="70" y="84" width="231" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a5E-84-Vah">
-                                <frame key="frameInset" minX="179" minY="526" width="242" height="54"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="a5E-84-Vah">
+                                <rect key="frame" x="66.5" y="593" width="242" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Call"/>
                                 <connections>
                                     <action selector="callButtonPressed:" destination="MBm-O2-Xi8" eventType="touchUpInside" id="s8D-r8-lf2"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="m3a-Lw-qtI">
-                                <frame key="frameInset" minX="16" minY="84" width="50" height="30"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="m3a-Lw-qtI">
+                                <rect key="frame" x="12" y="84" width="50" height="30"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
                         </subviews>
@@ -297,16 +300,16 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z9j-mY-B8P">
-                                <frame key="frameInset" minX="200" minY="229" width="200" height="42"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z9j-mY-B8P">
+                                <rect key="frame" x="87.5" y="262.5" width="200" height="42"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Decline"/>
                                 <connections>
                                     <action selector="declineButtonPressed:" destination="dkS-wQ-lUL" eventType="touchUpInside" id="JAH-pG-dXX"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b3y-t4-Zvp">
-                                <frame key="frameInset" minX="200" minY="329" width="200" height="42"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="b3y-t4-Zvp">
+                                <rect key="frame" x="87.5" y="362.5" width="200" height="42"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="200" id="ZSA-mN-0uj"/>
                                 </constraints>
@@ -316,18 +319,18 @@
                                     <action selector="acceptButtonPressed:" destination="dkS-wQ-lUL" eventType="touchUpInside" id="MTb-5g-gN7"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="QE1-Og-qxo">
-                                <frame key="frameInset" minX="200" minY="279" width="200" height="42"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="QE1-Og-qxo">
+                                <rect key="frame" x="87.5" y="312.5" width="200" height="42"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="number label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9aj-LC-Yip">
-                                <frame key="frameInset" minX="20" minY="84" width="560" height="30"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="number label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9aj-LC-Yip">
+                                <rect key="frame" x="16" y="84" width="343" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="number label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NRx-Bo-5sh">
-                                <frame key="frameInset" minX="20" minY="122" width="560" height="24"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="number label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NRx-Bo-5sh">
+                                <rect key="frame" x="16" y="122" width="343" height="24"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -380,20 +383,20 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="active number" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yg0-aG-22g">
-                                <frame key="frameInset" minX="76" minY="84" width="448" height="30"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="active number" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yg0-aG-22g">
+                                <rect key="frame" x="72" y="84" width="231" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="status call" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MB9-wF-e2Z">
-                                <frame key="frameInset" minX="76" minY="122" width="448" height="24"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="status call" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MB9-wF-e2Z">
+                                <rect key="frame" x="72" y="122" width="231" height="24"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="Zu8-2k-UXn">
-                                <frame key="frameInset" minX="250" minY="240" width="100" height="100"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="Zu8-2k-UXn">
+                                <rect key="frame" x="137.5" y="307" width="100" height="100"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Keypad"/>
                                 <userDefinedRuntimeAttributes>
@@ -403,8 +406,8 @@
                                     <action selector="keypadButtonPressed:" destination="1Mu-h3-ccv" eventType="touchUpInside" id="Md3-bl-aOv"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="0M8-7A-2EN">
-                                <frame key="frameInset" minX="310" minY="360" width="100" height="100"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="0M8-7A-2EN">
+                                <rect key="frame" x="197.5" y="427" width="100" height="100"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Hold"/>
                                 <userDefinedRuntimeAttributes>
@@ -414,8 +417,8 @@
                                     <action selector="holdButtonPressed:" destination="1Mu-h3-ccv" eventType="touchUpInside" id="po4-mT-zFk"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="gjV-xs-wVo">
-                                <frame key="frameInset" minX="370" minY="240" width="100" height="100"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="gjV-xs-wVo">
+                                <rect key="frame" x="257.5" y="307" width="100" height="100"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Speaker"/>
                                 <userDefinedRuntimeAttributes>
@@ -425,15 +428,15 @@
                                     <action selector="speakerButtonPressed:" destination="1Mu-h3-ccv" eventType="touchUpInside" id="aO3-qa-pJU"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Xss-U8-RbJ">
-                                <frame key="frameInset" minX="290" minY="375" width="20" height="69"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Xss-U8-RbJ">
+                                <rect key="frame" x="177.5" y="442" width="20" height="69"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="20" id="bkF-SG-mLF"/>
                                 </constraints>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="BUl-89-Ql4">
-                                <frame key="frameInset" minX="250" minY="480" width="100" height="100"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="BUl-89-Ql4">
+                                <rect key="frame" x="137.5" y="547" width="100" height="100"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Hangup"/>
                                 <userDefinedRuntimeAttributes>
@@ -443,8 +446,8 @@
                                     <action selector="hangupButtonPressed:" destination="1Mu-h3-ccv" eventType="touchUpInside" id="S0B-kf-NVG"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="bPE-Cd-qy5">
-                                <frame key="frameInset" minX="130" minY="240" width="100" height="100"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="bPE-Cd-qy5">
+                                <rect key="frame" x="17.5" y="307" width="100" height="100"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="bPE-Cd-qy5" secondAttribute="height" multiplier="1:1" id="Sze-2k-Mn7"/>
                                     <constraint firstAttribute="width" priority="999" constant="100" id="Ugp-gJ-AGk"/>
@@ -458,8 +461,8 @@
                                     <action selector="muteButtonPressed:" destination="1Mu-h3-ccv" eventType="touchUpInside" id="GJ0-Jp-LkO"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="jOb-YB-mYR">
-                                <frame key="frameInset" minX="190" minY="360" width="100" height="100"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="clip" translatesAutoresizingMaskIntoConstraints="NO" id="jOb-YB-mYR">
+                                <rect key="frame" x="77.5" y="427" width="100" height="100"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Transfer"/>
                                 <userDefinedRuntimeAttributes>
@@ -548,8 +551,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" tag="1" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="H7n-oH-PPy">
-                                <frame key="frameInset" minX="179" minY="230" width="54" height="54"/>
+                            <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="H7n-oH-PPy">
+                                <rect key="frame" x="66.5" y="297" width="54" height="54"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="H7n-oH-PPy" secondAttribute="height" multiplier="1:1" id="DZk-Cs-GKQ"/>
                                 </constraints>
@@ -559,80 +562,80 @@
                                     <action selector="keypadButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="UFa-Bs-nY2"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="5" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A0p-hy-xlM">
-                                <frame key="frameInset" minX="273" minY="304" width="54" height="54"/>
+                            <button opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="A0p-hy-xlM">
+                                <rect key="frame" x="160.5" y="371" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="5"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="38Q-G6-VkM"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="4" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z2n-Jf-zOa">
-                                <frame key="frameInset" minX="179" minY="304" width="54" height="54"/>
+                            <button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="z2n-Jf-zOa">
+                                <rect key="frame" x="66.5" y="371" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="4"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="RZh-zS-4Hn"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="8" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pDn-hA-ajb">
-                                <frame key="frameInset" minX="273" minY="378" width="54" height="54"/>
+                            <button opaque="NO" tag="8" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pDn-hA-ajb">
+                                <rect key="frame" x="160.5" y="445" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="8"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="K1c-p1-EMh"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="9" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zt8-rK-Djp">
-                                <frame key="frameInset" minX="367" minY="378" width="54" height="54"/>
+                            <button opaque="NO" tag="9" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Zt8-rK-Djp">
+                                <rect key="frame" x="254.5" y="445" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="9"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="8ug-4p-8eI"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="7" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fc6-JZ-7OV">
-                                <frame key="frameInset" minX="179" minY="378" width="54" height="54"/>
+                            <button opaque="NO" tag="7" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="fc6-JZ-7OV">
+                                <rect key="frame" x="66.5" y="445" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="7"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="LDt-bW-lBs"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="11" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1TF-ee-1dx">
-                                <frame key="frameInset" minX="367" minY="452" width="54" height="54"/>
+                            <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1TF-ee-1dx">
+                                <rect key="frame" x="254.5" y="519" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="#"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="RAt-o8-aLy"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="10" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="K6a-2q-5z1">
-                                <frame key="frameInset" minX="179" minY="452" width="54" height="54"/>
+                            <button opaque="NO" tag="10" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="K6a-2q-5z1">
+                                <rect key="frame" x="66.5" y="519" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="*"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="85c-om-HMC"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="6" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xBt-nn-a7N">
-                                <frame key="frameInset" minX="367" minY="304" width="54" height="54"/>
+                            <button opaque="NO" tag="6" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xBt-nn-a7N">
+                                <rect key="frame" x="254.5" y="371" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="6"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="2MU-4e-dSb"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="3" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s0u-V1-8bi">
-                                <frame key="frameInset" minX="367" minY="230" width="54" height="54"/>
+                            <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="s0u-V1-8bi">
+                                <rect key="frame" x="254.5" y="297" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="3"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="fh5-Uo-AlX"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="3" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jR1-C4-ifr">
-                                <frame key="frameInset" minX="534" minY="136" width="50" height="30"/>
+                            <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jR1-C4-ifr">
+                                <rect key="frame" x="313" y="136" width="50" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="50" id="CHQ-Dp-8In"/>
                                 </constraints>
@@ -642,24 +645,25 @@
                                     <action selector="deleteButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="Snh-Lg-sFe"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="2" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LRV-2t-x47">
-                                <frame key="frameInset" minX="273" minY="230" width="54" height="54"/>
+                            <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LRV-2t-x47">
+                                <rect key="frame" x="160.5" y="297" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="2"/>
                                 <connections>
                                     <action selector="keypadButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="W20-lS-qgJ"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ygI-5J-Vl9">
-                                <frame key="frameInset" minY="64" width="600" height="52"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ygI-5J-Vl9">
+                                <rect key="frame" x="-4" y="64" width="383" height="52"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="currentCall status" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3X1-Xk-Zv7">
-                                        <frame key="frameInset" minX="456" minY="15" width="136" height="21"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="currentCall status" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3X1-Xk-Zv7">
+                                        <rect key="frame" x="239" y="15" width="136" height="21"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="currentCall number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WX3-fG-qMM">
+                                        <rect key="frame" x="8" y="16" width="147.5" height="20.5"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
@@ -675,26 +679,26 @@
                                     <constraint firstItem="WX3-fG-qMM" firstAttribute="baseline" secondItem="3X1-Xk-Zv7" secondAttribute="baseline" id="s83-Q8-4B0"/>
                                 </constraints>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="number to dial" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NiU-OF-gUz">
-                                <frame key="frameInset" minX="78" minY="136" width="448" height="30"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="number to dial" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NiU-OF-gUz">
+                                <rect key="frame" x="74" y="136" width="231" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mYM-pX-A13">
-                                <frame key="frameInset" minX="179" minY="526" width="242" height="54"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="mYM-pX-A13">
+                                <rect key="frame" x="66.5" y="593" width="242" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Call"/>
                                 <connections>
                                     <action selector="callButtonPressed:" destination="jXM-VD-3Or" eventType="touchUpInside" id="sM0-Hn-EKc"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="IjH-gN-v0Q">
-                                <frame key="frameInset" minX="20" minY="136" width="50" height="30"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IjH-gN-v0Q">
+                                <rect key="frame" x="16" y="136" width="50" height="30"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y8u-Zm-ORg">
-                                <frame key="frameInset" minX="273" minY="452" width="54" height="54"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y8u-Zm-ORg">
+                                <rect key="frame" x="160.5" y="519" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="0"/>
                                 <connections>
@@ -796,8 +800,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <button opaque="NO" tag="1" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VWS-rB-kVS">
-                                <frame key="frameInset" minX="179" minY="304" width="54" height="54"/>
+                            <button opaque="NO" tag="1" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VWS-rB-kVS">
+                                <rect key="frame" x="66.5" y="371" width="54" height="54"/>
                                 <constraints>
                                     <constraint firstAttribute="width" secondItem="VWS-rB-kVS" secondAttribute="height" multiplier="1:1" id="KvK-pJ-bkd"/>
                                 </constraints>
@@ -807,100 +811,100 @@
                                     <action selector="keypadNumberPressed:" destination="ebh-bT-Bvs" eventType="touchUpInside" id="dCg-TT-YuV"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="5" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gLI-Wc-ABo">
-                                <frame key="frameInset" minX="273" minY="378" width="54" height="54"/>
+                            <button opaque="NO" tag="5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gLI-Wc-ABo">
+                                <rect key="frame" x="160.5" y="445" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="5"/>
                                 <connections>
                                     <action selector="keypadNumberPressed:" destination="ebh-bT-Bvs" eventType="touchUpInside" id="LFb-Mj-49g"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="4" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XM1-uR-JxV">
-                                <frame key="frameInset" minX="179" minY="378" width="54" height="54"/>
+                            <button opaque="NO" tag="4" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XM1-uR-JxV">
+                                <rect key="frame" x="66.5" y="445" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="4"/>
                                 <connections>
                                     <action selector="keypadNumberPressed:" destination="ebh-bT-Bvs" eventType="touchUpInside" id="crb-24-0LZ"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="9" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8fW-I2-Bvp">
-                                <frame key="frameInset" minX="367" minY="452" width="54" height="54"/>
+                            <button opaque="NO" tag="9" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8fW-I2-Bvp">
+                                <rect key="frame" x="254.5" y="519" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="9"/>
                                 <connections>
                                     <action selector="keypadNumberPressed:" destination="ebh-bT-Bvs" eventType="touchUpInside" id="bob-Ji-8qx"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="7" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OSp-Rb-o8M">
-                                <frame key="frameInset" minX="179" minY="452" width="54" height="54"/>
+                            <button opaque="NO" tag="7" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="OSp-Rb-o8M">
+                                <rect key="frame" x="66.5" y="519" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="7"/>
                                 <connections>
                                     <action selector="keypadNumberPressed:" destination="ebh-bT-Bvs" eventType="touchUpInside" id="2Bl-Ns-2dz"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zUV-YG-INc">
-                                <frame key="frameInset" minX="273" minY="526" width="54" height="54"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="zUV-YG-INc">
+                                <rect key="frame" x="160.5" y="593" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="0"/>
                                 <connections>
                                     <action selector="keypadNumberPressed:" destination="ebh-bT-Bvs" eventType="touchUpInside" id="vys-Sl-cx4"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="11" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="awU-oN-UTP">
-                                <frame key="frameInset" minX="367" minY="526" width="54" height="54"/>
+                            <button opaque="NO" tag="11" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="awU-oN-UTP">
+                                <rect key="frame" x="254.5" y="593" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="#"/>
                                 <connections>
                                     <action selector="keypadNumberPressed:" destination="ebh-bT-Bvs" eventType="touchUpInside" id="Wrm-dS-9iw"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="10" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pjf-9U-ILH">
-                                <frame key="frameInset" minX="179" minY="526" width="54" height="54"/>
+                            <button opaque="NO" tag="10" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Pjf-9U-ILH">
+                                <rect key="frame" x="66.5" y="593" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="*"/>
                                 <connections>
                                     <action selector="keypadNumberPressed:" destination="ebh-bT-Bvs" eventType="touchUpInside" id="8vA-P5-jEe"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="6" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="62w-cl-1Vb">
-                                <frame key="frameInset" minX="367" minY="378" width="54" height="54"/>
+                            <button opaque="NO" tag="6" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="62w-cl-1Vb">
+                                <rect key="frame" x="254.5" y="445" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="6"/>
                                 <connections>
                                     <action selector="keypadNumberPressed:" destination="ebh-bT-Bvs" eventType="touchUpInside" id="grg-wU-VRI"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="3" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iHR-ep-sEp">
-                                <frame key="frameInset" minX="367" minY="304" width="54" height="54"/>
+                            <button opaque="NO" tag="3" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iHR-ep-sEp">
+                                <rect key="frame" x="254.5" y="371" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="3"/>
                                 <connections>
                                     <action selector="keypadNumberPressed:" destination="ebh-bT-Bvs" eventType="touchUpInside" id="Bog-Cx-SGL"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" tag="2" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lS0-pR-LH7">
-                                <frame key="frameInset" minX="273" minY="304" width="54" height="54"/>
+                            <button opaque="NO" tag="2" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="lS0-pR-LH7">
+                                <rect key="frame" x="160.5" y="371" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="2"/>
                                 <connections>
                                     <action selector="keypadNumberPressed:" destination="ebh-bT-Bvs" eventType="touchUpInside" id="ISf-2Q-mje"/>
                                 </connections>
                             </button>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="active number label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oof-v4-vZb">
-                                <frame key="frameInset" minX="20" minY="84" width="560" height="30"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="active number label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Oof-v4-vZb">
+                                <rect key="frame" x="16" y="84" width="343" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="DTMF pressed" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="paP-bE-bbg">
-                                <frame key="frameInset" minX="20" minY="122" width="560" height="23"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="DTMF pressed" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="paP-bE-bbg">
+                                <rect key="frame" x="16" y="122" width="343" height="23"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="19"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" tag="8" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CwO-OX-xnh">
-                                <frame key="frameInset" minX="273" minY="452" width="54" height="54"/>
+                            <button opaque="NO" tag="8" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="CwO-OX-xnh">
+                                <rect key="frame" x="160.5" y="519" width="54" height="54"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="35"/>
                                 <state key="normal" title="8"/>
                                 <connections>
@@ -982,16 +986,17 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UDH-33-5I9">
-                                <frame key="frameInset" minY="64" width="600" height="52"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="UDH-33-5I9">
+                                <rect key="frame" x="-4" y="64" width="383" height="52"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="firstCall status" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dDH-Se-2Na">
-                                        <frame key="frameInset" minX="482" minY="15" width="110" height="21"/>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="firstCall status" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dDH-Se-2Na">
+                                        <rect key="frame" x="265" y="15" width="110" height="21"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="firstCall number" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aiZ-DR-ocK">
+                                        <rect key="frame" x="8" y="16" width="122" height="20.5"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                         <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                         <nil key="highlightedColor"/>
@@ -1007,20 +1012,20 @@
                                     <constraint firstAttribute="trailing" secondItem="dDH-Se-2Na" secondAttribute="trailing" constant="8" id="xWm-0H-IpO"/>
                                 </constraints>
                             </view>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="active number" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jXc-6D-ODD">
-                                <frame key="frameInset" minX="76" minY="136" width="448" height="30"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="active number" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jXc-6D-ODD">
+                                <rect key="frame" x="72" y="136" width="231" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="status call" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aeQ-hd-9Fs">
-                                <frame key="frameInset" minX="76" minY="174" width="448" height="24"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="status call" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aeQ-hd-9Fs">
+                                <rect key="frame" x="72" y="174" width="231" height="24"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="20"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gUj-Rw-kVv">
-                                <frame key="frameInset" minX="250" minY="480" width="100" height="100"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gUj-Rw-kVv">
+                                <rect key="frame" x="137.5" y="547" width="100" height="100"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Hangup"/>
                                 <userDefinedRuntimeAttributes>
@@ -1030,8 +1035,8 @@
                                     <action selector="hangupButtonPressed:" destination="eMd-Ko-MFh" eventType="touchUpInside" id="7vk-hy-nAe"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dNv-UC-lTw">
-                                <frame key="frameInset" minX="310" minY="360" width="100" height="100"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="dNv-UC-lTw">
+                                <rect key="frame" x="197.5" y="427" width="100" height="100"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Hold"/>
                                 <userDefinedRuntimeAttributes>
@@ -1041,15 +1046,15 @@
                                     <action selector="holdButtonPressed:" destination="eMd-Ko-MFh" eventType="touchUpInside" id="hox-XS-Vt5"/>
                                 </connections>
                             </button>
-                            <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="kX4-4v-bT5">
-                                <frame key="frameInset" minX="290" minY="375" width="20" height="69"/>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="kX4-4v-bT5">
+                                <rect key="frame" x="177.5" y="442" width="20" height="69"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="20" id="1qR-eP-cyQ"/>
                                 </constraints>
                             </view>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VAj-jp-f3o">
-                                <frame key="frameInset" minX="130" minY="240" width="100" height="100"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="VAj-jp-f3o">
+                                <rect key="frame" x="17.5" y="307" width="100" height="100"/>
                                 <constraints>
                                     <constraint firstAttribute="width" priority="999" constant="100" id="FQD-3u-BdF"/>
                                     <constraint firstAttribute="width" secondItem="VAj-jp-f3o" secondAttribute="height" multiplier="1:1" id="IPP-fT-jJ3"/>
@@ -1063,8 +1068,8 @@
                                     <action selector="muteButtonPressed:" destination="eMd-Ko-MFh" eventType="touchUpInside" id="rYA-t0-iza"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QzT-jt-ePG">
-                                <frame key="frameInset" minX="250" minY="240" width="100" height="100"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QzT-jt-ePG">
+                                <rect key="frame" x="137.5" y="307" width="100" height="100"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Keypad"/>
                                 <userDefinedRuntimeAttributes>
@@ -1074,8 +1079,8 @@
                                     <action selector="keypadButtonPressed:" destination="eMd-Ko-MFh" eventType="touchUpInside" id="bQ5-bT-b4x"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oLf-Vp-dE2">
-                                <frame key="frameInset" minX="190" minY="360" width="100" height="100"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oLf-Vp-dE2">
+                                <rect key="frame" x="77.5" y="427" width="100" height="100"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Transfer Calls"/>
                                 <userDefinedRuntimeAttributes>
@@ -1085,8 +1090,8 @@
                                     <action selector="transferButtonPressed:" destination="eMd-Ko-MFh" eventType="touchUpInside" id="XsD-X4-YaQ"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U3D-wn-9Yx">
-                                <frame key="frameInset" minX="370" minY="240" width="100" height="100"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U3D-wn-9Yx">
+                                <rect key="frame" x="257.5" y="307" width="100" height="100"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <state key="normal" title="Speaker"/>
                                 <userDefinedRuntimeAttributes>
@@ -1178,20 +1183,20 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="firstCall number label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Vs-NO-oXd">
-                                <frame key="frameInset" minX="182" minY="239" width="236" height="30"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="firstCall number label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Vs-NO-oXd">
+                                <rect key="frame" x="69.5" y="273" width="236" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="Call Transfer status" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iuT-Sk-lVp">
-                                <frame key="frameInset" minX="226" minY="289" width="148" height="21"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Call Transfer status" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iuT-Sk-lVp">
+                                <rect key="frame" x="113.5" y="323" width="148" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" text="secondCall number label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V7q-3y-JH6">
-                                <frame key="frameInset" minX="162" minY="330" width="276" height="30"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="secondCall number label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="V7q-3y-JH6">
+                                <rect key="frame" x="49.5" y="364" width="276" height="30"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="25"/>
                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <nil key="highlightedColor"/>
@@ -1247,7 +1252,7 @@
         </scene>
     </scenes>
     <inferredMetricsTieBreakers>
-        <segue reference="r6l-M1-URi"/>
-        <segue reference="gOS-Fu-cCZ"/>
+        <segue reference="YHy-xe-5wc"/>
+        <segue reference="za9-Z6-H2d"/>
     </inferredMetricsTieBreakers>
 </document>
diff --git a/Example/VialerSIPLib/VSLIncomingCallViewController.swift b/Example/VialerSIPLib/VSLIncomingCallViewController.swift
index 6480574a..e7d66e54 100644
--- a/Example/VialerSIPLib/VSLIncomingCallViewController.swift
+++ b/Example/VialerSIPLib/VSLIncomingCallViewController.swift
@@ -63,53 +63,57 @@ class VSLIncomingCallViewController: UIViewController {
     // MARK: - Actions
 
     @IBAction func declineButtonPressed(_ sender: UIButton) {
-        try! call?.hangup()
-        performSegue(withIdentifier: Configuration.Segues.UnwindToMainViewController, sender: nil)
+        guard let call = call else { return }
+        callManager.end(call) { error in
+            if error != nil {
+                DDLogWrapper.logError("cannot decline call: \(error)")
+            } else {
+                self.performSegue(withIdentifier: Configuration.Segues.UnwindToMainViewController, sender: nil)
+            }
+        }
     }
 
     @IBAction func acceptButtonPressed(_ sender: UIButton) {
-        if let call = call, call.callState == .incoming {
-
-            callManager.answer(call) { error in
-                if error != nil {
-                    DDLogWrapper.logError("error answering call: \(error)")
-                } else {
-                    self.performSegue(withIdentifier: Configuration.Segues.ShowCall, sender: nil)
-                }
+        guard let call = call, call.callState == .incoming else { return }
+        callManager.answer(call) { error in
+            if error != nil {
+                DDLogWrapper.logError("error answering call: \(error)")
+            } else {
+                self.performSegue(withIdentifier: Configuration.Segues.ShowCall, sender: nil)
             }
         }
     }
 
     fileprivate func updateUI() {
-        if let call = call {
-            numberLabel?.text = call.callerNumber
-            switch call.callState {
-            case .incoming:
-                statusLabel?.text = "Incoming call"
-            case .connecting:
-                statusLabel?.text = "Connecting"
-            case .confirmed:
-                statusLabel?.text = "Connected"
-            case .disconnected:
-                statusLabel?.text = "Disconnected"
-            case .null: fallthrough
-            case .calling: fallthrough
-            case .early:
-                statusLabel?.text = "Invalid"
-            }
-
-            if call.callState == .incoming {
-                declineButton?.isEnabled = true
-                acceptButton?.isEnabled = true
-                ringtone.start()
-            } else {
-                ringtone.stop()
-                declineButton?.isEnabled = false
-                acceptButton?.isEnabled = false
-            }
-        } else {
+        guard let call = call else {
             numberLabel?.text = ""
             statusLabel?.text = ""
+            return
+        }
+        numberLabel?.text = call.callerNumber
+        switch call.callState {
+        case .incoming:
+            statusLabel?.text = "Incoming call"
+        case .connecting:
+            statusLabel?.text = "Connecting"
+        case .confirmed:
+            statusLabel?.text = "Connected"
+        case .disconnected:
+            statusLabel?.text = "Disconnected"
+        case .null: fallthrough
+        case .calling: fallthrough
+        case .early:
+            statusLabel?.text = "Invalid"
+        }
+
+        if call.callState == .incoming {
+            declineButton?.isEnabled = true
+            acceptButton?.isEnabled = true
+            ringtone.start()
+        } else {
+            ringtone.stop()
+            declineButton?.isEnabled = false
+            acceptButton?.isEnabled = false
         }
     }
 
diff --git a/Example/VialerSIPLib/VSLSecondCallViewController.swift b/Example/VialerSIPLib/VSLSecondCallViewController.swift
index 4227883a..87630c28 100644
--- a/Example/VialerSIPLib/VSLSecondCallViewController.swift
+++ b/Example/VialerSIPLib/VSLSecondCallViewController.swift
@@ -62,28 +62,28 @@ class VSLSecondCallViewController: VSLCallViewController {
     }
 
     override func endCall() {
-        if let call = activeCall, call.callState != .null {
-            do {
-                try call.hangup()
+        guard let call = activeCall, call.callState != .null else { return }
+
+        callManager.end(call) { error in
+            if error != nil {
+                DDLogWrapper.logError("Could not end call: \(error)")
+            } else {
                 self.performSegue(withIdentifier: Configuration.Segues.UnwindToFirstCall, sender: nil)
-            } catch let error {
-                DDLogWrapper.logError("Couldn't hangup call: \(error)")
             }
         }
     }
 
     @IBAction func cancelButtonPressed(_ sender: UIBarButtonItem) {
-
-        // Hangup active Call if it is not disconnected.
-        if let call = activeCall, call.callState != .disconnected {
-            do {
-                try call.hangup()
+        guard let call = activeCall, call.callState != .disconnected else {
+            self.performSegue(withIdentifier: Configuration.Segues.UnwindToFirstCall, sender: nil)
+            return
+        }
+        callManager.end(call) { error in
+            if error != nil {
+                DDLogWrapper.logError("Could not end call: \(error)")
+            } else {
                 self.performSegue(withIdentifier: Configuration.Segues.UnwindToFirstCall, sender: nil)
-            } catch let error {
-                DDLogWrapper.logError("Couldn't hangup call: \(error)")
             }
-        } else {
-            self.performSegue(withIdentifier: Configuration.Segues.UnwindToFirstCall, sender: nil)
         }
     }
 
diff --git a/Example/VialerSIPLib/VSLTransferCallViewController.swift b/Example/VialerSIPLib/VSLTransferCallViewController.swift
index f9f3c991..31a53911 100644
--- a/Example/VialerSIPLib/VSLTransferCallViewController.swift
+++ b/Example/VialerSIPLib/VSLTransferCallViewController.swift
@@ -61,10 +61,16 @@ private var myContext = 0
 
     @IBAction override func callButtonPressed(_ sender: UIButton) {
         UIDevice.current.isProximityMonitoringEnabled = true
-        if let number = numberToDialLabel.text, number != "" {
-            currentCall?.account!.callNumber(number) { (call, error) in
+        guard let number = numberToDialLabel.text, number != "" else { return }
+
+        callManager.startCall(toNumber: number, for: currentCall!.account! ) { (call, error) in
+            if error != nil {
+                DDLogWrapper.logError("Could not start second call: \(error)")
+            } else {
                 self.newCall = call
-                self.performSegue(withIdentifier: Configuration.Segues.SecondCallActive, sender: nil)
+                DispatchQueue.main.async {
+                    self.performSegue(withIdentifier: Configuration.Segues.SecondCallActive, sender: nil)
+                }
             }
         }
     }
diff --git a/Pod/Classes/CallKitProviderDelegate.m b/Pod/Classes/CallKitProviderDelegate.m
index 24b48cf9..71ef0146 100644
--- a/Pod/Classes/CallKitProviderDelegate.m
+++ b/Pod/Classes/CallKitProviderDelegate.m
@@ -48,8 +48,8 @@ - (CXProviderConfiguration *)providerConfiguration {
     CXProviderConfiguration *providerConfiguration = [[CXProviderConfiguration alloc]
                                                       initWithLocalizedName:NSLocalizedString(appname, nil)];
 
-    providerConfiguration.maximumCallGroups = 1;
-    providerConfiguration.maximumCallsPerCallGroup = 2;
+    providerConfiguration.maximumCallGroups = 2;
+    providerConfiguration.maximumCallsPerCallGroup = 1;
     providerConfiguration.supportsVideo = false;
 
     providerConfiguration.supportedHandleTypes = [NSSet setWithObject:[NSNumber numberWithInt:CXHandleTypePhoneNumber]];
@@ -188,6 +188,9 @@ - (void)provider:(CXProvider *)provider performSetHeldCallAction:(CXSetHeldCallA
         DDLogError(@"Could not hold call(%@). Error: %@", call.uuid.UUIDString, holdError);
         [action fail];
     } else {
+        if (call.onHold) {
+            [self.callManager.audioController deactivateAudioSession];
+        }
         [action fulfill];
     }
 }
diff --git a/Pod/Classes/VSLAudioController.m b/Pod/Classes/VSLAudioController.m
index c2591337..f718b2c4 100644
--- a/Pod/Classes/VSLAudioController.m
+++ b/Pod/Classes/VSLAudioController.m
@@ -54,7 +54,9 @@ - (void)checkCurrentThreadIsRegisteredWithPJSUA {
 }
 
 - (void)activateAudioSession {
+    DDLogDebug(@"Activating audiosession");
     [self checkCurrentThreadIsRegisteredWithPJSUA];
+    pjsua_set_no_snd_dev();
     pj_status_t status;
     status = pjsua_set_snd_dev(PJMEDIA_AUD_DEFAULT_CAPTURE_DEV, PJMEDIA_AUD_DEFAULT_PLAYBACK_DEV);
     if (status != PJ_SUCCESS) {
@@ -63,6 +65,7 @@ - (void)activateAudioSession {
 }
 
 - (void)deactivateAudioSession {
+    DDLogDebug(@"Deactivating audiosession");
     [self checkCurrentThreadIsRegisteredWithPJSUA];
     pjsua_set_no_snd_dev();
 }
diff --git a/Pod/Classes/VSLCall.m b/Pod/Classes/VSLCall.m
index ef7db510..3c3ed194 100644
--- a/Pod/Classes/VSLCall.m
+++ b/Pod/Classes/VSLCall.m
@@ -310,7 +310,7 @@ - (void)mediaStateChanged:(pjsua_call_info)callInfo  {
     DDLogVerbose(@"Media State Changed from %@ to %@", VSLMediaStateString(self.mediaState), VSLMediaStateString((VSLMediaState)mediaState));
     self.mediaState = (VSLMediaState)mediaState;
 
-    if (_mediaState == PJSUA_CALL_MEDIA_ACTIVE || _mediaState == PJSUA_CALL_MEDIA_REMOTE_HOLD) {
+    if (self.mediaState == VSLMediaStateActive || self.mediaState == VSLMediaStateRemoteHold) {
         [self.ringback stop];
         pjsua_conf_connect(callInfo.conf_slot, 0);
         pjsua_conf_connect(0, callInfo.conf_slot);
@@ -450,7 +450,7 @@ - (BOOL)toggleHold:(NSError **)error {
             *error = [NSError errorWithDomain:VSLCallErrorDomain code:VSLCallErrorCannotToggleHold userInfo:userInfo];
         }
         return NO;
-        DDLogError(@"Error toggle muting microphone in call %@", self.uuid.UUIDString);
+        DDLogError(@"Error toggle holding in call %@", self.uuid.UUIDString);
     }
     return YES;
 }
diff --git a/Pod/Classes/VSLCallManager.m b/Pod/Classes/VSLCallManager.m
index 30ebe131..ab1c8397 100644
--- a/Pod/Classes/VSLCallManager.m
+++ b/Pod/Classes/VSLCallManager.m
@@ -5,6 +5,7 @@
 //
 
 #import "VSLCallManager.h"
+
 @import CallKit;
 #import "Constants.h"
 #import <CocoaLumberJack/CocoaLumberjack.h>
@@ -147,10 +148,9 @@ - (void)toggleHoldForCall:(VSLCall *)call completion:(void (^)(NSError * _Nullab
     if ([VialerSIPLib callKitAvailable]) {
         CXAction *toggleHoldAction = [[CXSetHeldCallAction alloc] initWithCallUUID:call.uuid onHold:!call.onHold];
         [self requestCallKitAction:toggleHoldAction completion:completion];
-
     } else {
         NSError *holdError;
-        [call toggleMute:&holdError];
+        [call toggleHold:&holdError];
         if (holdError) {
             DDLogError(@"Could not hold call (%@). Error: %@", call.uuid.UUIDString, holdError);
             completion(holdError);