diff --git a/GoLive.xcodeproj/project.pbxproj b/GoLive.xcodeproj/project.pbxproj
index 03d4c3b..36effc1 100644
--- a/GoLive.xcodeproj/project.pbxproj
+++ b/GoLive.xcodeproj/project.pbxproj
@@ -91,12 +91,13 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0830;
-				LastUpgradeCheck = 0830;
+				LastUpgradeCheck = 0920;
 				ORGANIZATIONNAME = "Mitchell Sweet";
 				TargetAttributes = {
 					514AB83B1F47939500C7D4E2 = {
 						CreatedOnToolsVersion = 8.3.2;
-						DevelopmentTeam = YZP52RND5S;
+						DevelopmentTeam = 3TCCEYF5TG;
+						LastSwiftMigration = 0920;
 						ProvisioningStyle = Automatic;
 					};
 				};
@@ -174,7 +175,9 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -182,7 +185,11 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -224,7 +231,9 @@
 				CLANG_CXX_LIBRARY = "libc++";
 				CLANG_ENABLE_MODULES = YES;
 				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
 				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
 				CLANG_WARN_CONSTANT_CONVERSION = YES;
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
@@ -232,7 +241,11 @@
 				CLANG_WARN_ENUM_CONVERSION = YES;
 				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
 				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -261,12 +274,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = YZP52RND5S;
+				DEVELOPMENT_TEAM = 3TCCEYF5TG;
 				INFOPLIST_FILE = GoLive/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.appcoda.GoLive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
 		};
@@ -274,12 +288,13 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				DEVELOPMENT_TEAM = YZP52RND5S;
+				DEVELOPMENT_TEAM = 3TCCEYF5TG;
 				INFOPLIST_FILE = GoLive/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.appcoda.GoLive;
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				SWIFT_VERSION = 3.0;
+				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
+				SWIFT_VERSION = 4.0;
 			};
 			name = Release;
 		};
diff --git a/GoLive.xcodeproj/project.xcworkspace/xcuserdata/mitchellsweet.xcuserdatad/UserInterfaceState.xcuserstate b/GoLive.xcodeproj/project.xcworkspace/xcuserdata/mitchellsweet.xcuserdatad/UserInterfaceState.xcuserstate
index e595aa9..dff00ae 100644
Binary files a/GoLive.xcodeproj/project.xcworkspace/xcuserdata/mitchellsweet.xcuserdatad/UserInterfaceState.xcuserstate and b/GoLive.xcodeproj/project.xcworkspace/xcuserdata/mitchellsweet.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/GoLive.xcodeproj/xcuserdata/mitchellsweet.xcuserdatad/xcschemes/GoLive.xcscheme b/GoLive.xcodeproj/xcuserdata/mitchellsweet.xcuserdatad/xcschemes/GoLive.xcscheme
index 6feaf21..981167b 100644
--- a/GoLive.xcodeproj/xcuserdata/mitchellsweet.xcuserdatad/xcschemes/GoLive.xcscheme
+++ b/GoLive.xcodeproj/xcuserdata/mitchellsweet.xcuserdatad/xcschemes/GoLive.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0830"
+   LastUpgradeVersion = "0920"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
@@ -45,6 +46,7 @@
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/GoLive/Base.lproj/Main.storyboard b/GoLive/Base.lproj/Main.storyboard
index 4693a5b..deebeeb 100644
--- a/GoLive/Base.lproj/Main.storyboard
+++ b/GoLive/Base.lproj/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12120" systemVersion="16E195" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="BYZ-38-t0r">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -25,7 +25,7 @@
                                 <rect key="frame" x="119.5" y="28" width="136" height="32"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="32" id="GN2-oa-eUz"/>
-                                    <constraint firstAttribute="width" constant="136" id="PF0-x8-cG3"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="136" id="PF0-x8-cG3"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
@@ -64,7 +64,7 @@
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Microphone" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="T7y-DL-IMw">
                                 <rect key="frame" x="141.5" y="418" width="92" height="21"/>
                                 <constraints>
-                                    <constraint firstAttribute="width" constant="92" id="Hms-Hh-LEa"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="92" id="Hms-Hh-LEa"/>
                                     <constraint firstAttribute="height" constant="21" id="kt9-1l-O4A"/>
                                 </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
@@ -75,7 +75,7 @@
                                 <rect key="frame" x="133.5" y="372" width="108" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="3BL-XH-7NV"/>
-                                    <constraint firstAttribute="width" constant="108" id="B5i-Km-b4q"/>
+                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="108" id="B5i-Km-b4q"/>
                                 </constraints>
                                 <state key="normal" title="Start Broadcast"/>
                                 <connections>
@@ -104,6 +104,7 @@
                         <outlet property="broadcastButton" destination="tL4-2S-1Xx" id="LTc-Ll-GBH"/>
                         <outlet property="colorSelector" destination="hIQ-gJ-1O9" id="RW6-UB-1cP"/>
                         <outlet property="colorView" destination="FRj-uP-fsm" id="vxJ-eg-lp3"/>
+                        <outlet property="micLabel" destination="T7y-DL-IMw" id="n16-o4-67l"/>
                         <outlet property="micSwitch" destination="Xbd-Ej-U93" id="F8o-O8-gN9"/>
                         <outlet property="statusLabel" destination="G6P-o7-xf2" id="OJR-G4-hQD"/>
                     </connections>
diff --git a/GoLive/ViewController.swift b/GoLive/ViewController.swift
index cce81be..028ff72 100644
--- a/GoLive/ViewController.swift
+++ b/GoLive/ViewController.swift
@@ -74,7 +74,10 @@ class ViewController: UIViewController, RPBroadcastActivityViewControllerDelegat
                 //5
                 if error == nil {
                     print("Broadcast started successfully!")
-                    self.broadcastStarted()
+                    // UI must always be changed in main thread. 
+                    DispatchQueue.main.async {
+                        self.broadcastStarted()
+                    }
                 }
             }
         }