diff --git a/Delivery/macOS/App/AppDelegate.swift b/Delivery/macOS/App/AppDelegate.swift
index e874720..3116253 100644
--- a/Delivery/macOS/App/AppDelegate.swift
+++ b/Delivery/macOS/App/AppDelegate.swift
@@ -32,13 +32,15 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 	override init() {
 		super.init()
         
-        // For testing
+        #if DEBUG
+        // Simulate a freshly installed app by resetting the preferences
 //        localPreferences.reset()
 //        UserDefaults.standard.serverChangeToken = nil
-        localPreferences.reset(.wizardStep)
-        localPreferences.set(true, forKey: .firstLaunch, version: Versioning.appVersion)
-        localPreferences.set(0, forKey: .wizardStep)
-        localPreferences.set(false, forKey: .enableGit)
+//        localPreferences.reset(.wizardStep)
+//        localPreferences.set(true, forKey: .firstLaunch, version: Versioning.appVersion)
+//        localPreferences.set(0, forKey: .wizardStep)
+//        localPreferences.set(false, forKey: .enableGit)
+        #endif
         
         localRepository = SqliteRepository()
         #if APPSTORE
@@ -57,9 +59,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         menu.isDark = theme.isDark
 		menu.onOpen = {
             self.removeActivePopup()
-            let firstLaunch = self.localPreferences.bool(.firstLaunch, version: Versioning.appVersion)
+            let isFirstLaunch = self.localPreferences.bool(.firstLaunch, version: Versioning.appVersion)
             let wizardStep = self.localPreferences.int(.wizardStep)
-            if firstLaunch {
+            if isFirstLaunch {
                 self.presentWelcomePopup()
             }
             else if wizardStep != WizardStep.finished.rawValue {
diff --git a/Delivery/macOS/App/Versioning.swift b/Delivery/macOS/App/Versioning.swift
index 44a8af0..3d5caa2 100644
--- a/Delivery/macOS/App/Versioning.swift
+++ b/Delivery/macOS/App/Versioning.swift
@@ -16,7 +16,8 @@ struct Versioning {
     static let appVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
     static let compatibilityMaps: [String: Versions] = [
         "17.06.14": (shellScript: "1.0", browserScript: "1.0", jirassicCmd: "17.06.14", jitCmd: "17.06.14"),
-        "18.04.04": (shellScript: "1.0", browserScript: "1.1", jirassicCmd: "17.06.14", jitCmd: "17.06.14")
+        "18.04.04": (shellScript: "1.0", browserScript: "1.1", jirassicCmd: "17.06.14", jitCmd: "17.06.14"),
+        "18.04.25": (shellScript: "1.0", browserScript: "1.1", jirassicCmd: "18.04.25", jitCmd: "18.04.25")
         // Add a new compatibility for each app version that needs one
     ]
     
diff --git a/Delivery/macOS/Info.plist b/Delivery/macOS/Info.plist
index 64136a7..83600f8 100644
--- a/Delivery/macOS/Info.plist
+++ b/Delivery/macOS/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>18.04.23</string>
+	<string>18.04.25</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>8</string>
+	<string>9</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.productivity</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/Delivery/macOS/Screens/Settings/Input/JirassicCmd/JirassicCell.swift b/Delivery/macOS/Screens/Settings/Input/JirassicCmd/JirassicCell.swift
index bb39296..e3a0ce1 100644
--- a/Delivery/macOS/Screens/Settings/Input/JirassicCmd/JirassicCell.swift
+++ b/Delivery/macOS/Screens/Settings/Input/JirassicCmd/JirassicCell.swift
@@ -28,10 +28,10 @@ class JirassicCell: NSTableRowView {
                 : NSImage.Name.statusPartiallyAvailable)
             textField.stringValue = compatible
                 ? "Installed, run 'jirassic' in Terminal for more info"
-                : "Outdated or uninstalled, please install!"
+                : "Outdated or not installed, please install the latest version!"
         } else {
             statusImageView.image = NSImage(named: NSImage.Name.statusUnavailable)
-            textField.stringValue = "Install shell support first!"
+            textField.stringValue = "Cannot determine compatibility, install shell support first!"
         }
         butInstall.isHidden = available && compatible
     }
diff --git a/Delivery/macOS/Screens/Settings/Input/Jit/JitCell.swift b/Delivery/macOS/Screens/Settings/Input/Jit/JitCell.swift
index f71f33d..e2aad22 100644
--- a/Delivery/macOS/Screens/Settings/Input/Jit/JitCell.swift
+++ b/Delivery/macOS/Screens/Settings/Input/Jit/JitCell.swift
@@ -36,10 +36,10 @@ class JitCell: NSTableRowView {
             
             textField.stringValue = compatible
                 ? "Installed, run 'jit' in Terminal for more info"
-                : "Applescript installed but 'jit' CLI is outdated/uninstalled"
+                : "Jit is outdated or not installed, please install the latest version!"
         } else {
             statusImageView.image = NSImage(named: NSImage.Name.statusUnavailable)
-            textField.stringValue = "Install shell support first!"
+            textField.stringValue = "Cannot determine Jit compatibility, install shell support first!"
         }
         butInstall.isHidden = available && compatible
     }
diff --git a/Delivery/macOS/Screens/Settings/Settings.storyboard b/Delivery/macOS/Screens/Settings/Settings.storyboard
index db1ff92..a1a33e6 100644
--- a/Delivery/macOS/Screens/Settings/Settings.storyboard
+++ b/Delivery/macOS/Screens/Settings/Settings.storyboard
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
         <capability name="box content view" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -61,34 +60,6 @@
                                     <action selector="handleSaveButton:" target="J1c-ZL-C5e" id="eUr-xg-ou7"/>
                                 </connections>
                             </button>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="7Op-cc-eNR">
-                                <rect key="frame" x="7" y="450" width="24" height="24"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="24" id="FAr-ut-k7v"/>
-                                    <constraint firstAttribute="height" constant="24" id="JoT-ji-GDg"/>
-                                </constraints>
-                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ButClose" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="9g5-lO-gFK">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="handleQuitAppButton:" target="J1c-ZL-C5e" id="owu-QK-Oel"/>
-                                </connections>
-                            </button>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="Hez-3a-Spi">
-                                <rect key="frame" x="30" y="450" width="24" height="24"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="24" id="PQh-Rm-W3G"/>
-                                    <constraint firstAttribute="width" constant="24" id="an2-9q-Fdz"/>
-                                </constraints>
-                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ButMinimize" imagePosition="only" alignment="center" alternateImage="ButMinimize" imageScaling="proportionallyDown" inset="2" id="ghr-Jp-de2">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="handleMinimizeAppButton:" target="J1c-ZL-C5e" id="sJ1-lY-EXP"/>
-                                </connections>
-                            </button>
                             <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="SGn-yv-6JW">
                                 <rect key="frame" x="144" y="451" width="205" height="23"/>
                                 <segmentedCell key="cell" borderStyle="border" alignment="left" style="texturedSquare" trackingMode="selectOne" id="pn1-lj-JjN">
@@ -103,31 +74,35 @@
                                     <action selector="handleSegmentedControl:" target="J1c-ZL-C5e" id="wev-kc-A58"/>
                                 </connections>
                             </segmentedControl>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="3j7-kb-qU6">
-                                <rect key="frame" x="53" y="450" width="24" height="24"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="24" id="nor-Si-z0O"/>
-                                    <constraint firstAttribute="height" constant="24" id="zbc-7a-eWU"/>
-                                </constraints>
-                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ButDisabled" imagePosition="only" alignment="center" alternateImage="ButDisabled" imageScaling="proportionallyDown" inset="2" id="FGs-IY-tvF">
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sOP-ZD-50a">
+                                <rect key="frame" x="12" y="453" width="38" height="19"/>
+                                <buttonCell key="cell" type="roundRect" title="Quit" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="fze-b8-HZ5">
                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
+                                    <font key="font" metaFont="cellTitle"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="handleQuitAppButton:" target="J1c-ZL-C5e" id="cS6-mT-WmX"/>
+                                </connections>
+                            </button>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JI6-hq-mSe">
+                                <rect key="frame" x="60" y="453" width="20" height="19"/>
+                                <buttonCell key="cell" type="roundRect" title="^" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ghA-S2-xyZ">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="cellTitle"/>
                                 </buttonCell>
                                 <connections>
-                                    <action selector="handleMinimizeAppButton:" target="J1c-ZL-C5e" id="TiA-fU-ju8"/>
+                                    <action selector="handleMinimizeAppButton:" target="J1c-ZL-C5e" id="hZX-uF-dti"/>
                                 </connections>
                             </button>
                         </subviews>
                         <constraints>
-                            <constraint firstItem="7Op-cc-eNR" firstAttribute="leading" secondItem="JAR-dh-Pss" secondAttribute="leading" constant="7" id="4KS-sV-fR6"/>
-                            <constraint firstItem="3j7-kb-qU6" firstAttribute="leading" secondItem="Hez-3a-Spi" secondAttribute="trailing" constant="-1" id="59u-an-LCi"/>
+                            <constraint firstItem="sOP-ZD-50a" firstAttribute="top" secondItem="JAR-dh-Pss" secondAttribute="top" constant="22" id="242-IV-jcI"/>
+                            <constraint firstItem="JI6-hq-mSe" firstAttribute="centerY" secondItem="sOP-ZD-50a" secondAttribute="centerY" id="8dv-Jg-hNO"/>
                             <constraint firstItem="PxN-df-6xl" firstAttribute="leading" secondItem="JAR-dh-Pss" secondAttribute="leading" constant="10" id="F1s-2p-LIi"/>
+                            <constraint firstItem="sOP-ZD-50a" firstAttribute="leading" secondItem="JAR-dh-Pss" secondAttribute="leading" constant="12" id="MC1-7c-utL"/>
                             <constraint firstAttribute="bottom" secondItem="PxN-df-6xl" secondAttribute="bottom" constant="91" id="Mhh-04-lzW"/>
-                            <constraint firstItem="3j7-kb-qU6" firstAttribute="centerY" secondItem="Hez-3a-Spi" secondAttribute="centerY" id="Nha-hr-j41"/>
-                            <constraint firstItem="7Op-cc-eNR" firstAttribute="top" secondItem="JAR-dh-Pss" secondAttribute="top" constant="20" id="RBZ-kd-nDQ"/>
-                            <constraint firstItem="Hez-3a-Spi" firstAttribute="centerY" secondItem="7Op-cc-eNR" secondAttribute="centerY" id="Rpf-X2-6Vt"/>
-                            <constraint firstItem="Hez-3a-Spi" firstAttribute="leading" secondItem="7Op-cc-eNR" secondAttribute="trailing" constant="-1" id="UTi-M2-rHs"/>
                             <constraint firstItem="SGn-yv-6JW" firstAttribute="centerX" secondItem="JAR-dh-Pss" secondAttribute="centerX" id="ZoM-gS-y3R"/>
+                            <constraint firstItem="JI6-hq-mSe" firstAttribute="leading" secondItem="sOP-ZD-50a" secondAttribute="trailing" constant="10" id="aLV-Bk-ZQg"/>
                             <constraint firstAttribute="trailing" secondItem="nlR-CY-a5k" secondAttribute="trailing" constant="12" id="bBK-E5-Tw5"/>
                             <constraint firstItem="PxN-df-6xl" firstAttribute="top" secondItem="JAR-dh-Pss" secondAttribute="top" constant="45" id="c7W-dQ-9er"/>
                             <constraint firstAttribute="trailing" secondItem="PxN-df-6xl" secondAttribute="trailing" constant="10" id="cPD-hz-qMV"/>
@@ -148,9 +123,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="ButClose" width="13" height="13"/>
-        <image name="ButDisabled" width="13" height="13"/>
-        <image name="ButMinimize" width="13" height="13"/>
         <image name="NSHomeTemplate" width="14" height="14"/>
     </resources>
 </document>
diff --git a/Delivery/macOS/Screens/Settings/Tracking/TrackingView.xib b/Delivery/macOS/Screens/Settings/Tracking/TrackingView.xib
index 70e1d5d..3c35593 100644
--- a/Delivery/macOS/Screens/Settings/Tracking/TrackingView.xib
+++ b/Delivery/macOS/Screens/Settings/Tracking/TrackingView.xib
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
         <capability name="box content view" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -15,28 +14,28 @@
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="wac-II-n6f">
-                    <rect key="frame" x="11" y="145" width="166" height="18"/>
+                    <rect key="frame" x="11" y="118" width="166" height="18"/>
                     <buttonCell key="cell" type="check" title="Lunch begins around" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="Vph-zn-2b8">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                 </button>
                 <button toolTip="Working hours not including the lunch break" translatesAutoresizingMaskIntoConstraints="NO" id="HF2-Ra-st6">
-                    <rect key="frame" x="11" y="202" width="128" height="18"/>
+                    <rect key="frame" x="11" y="175" width="128" height="18"/>
                     <buttonCell key="cell" type="check" title="Working between" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="8L9-IG-yRe">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                 </button>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="NDv-L1-vNy">
-                    <rect key="frame" x="11" y="88" width="166" height="18"/>
+                    <rect key="frame" x="11" y="61" width="166" height="18"/>
                     <buttonCell key="cell" type="check" title="Scrum begins around" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="y7O-oz-hLe">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
                     </buttonCell>
                 </button>
                 <button translatesAutoresizingMaskIntoConstraints="NO" id="UNt-JQ-D2v">
-                    <rect key="frame" x="11" y="319" width="239" height="18"/>
+                    <rect key="frame" x="11" y="292" width="239" height="18"/>
                     <buttonCell key="cell" type="check" title="Log tasks when computer wakes up" bezelStyle="regularSquare" imagePosition="left" state="on" inset="2" id="yJ1-ae-fOV">
                         <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
                         <font key="font" metaFont="system"/>
@@ -46,7 +45,7 @@
                     </connections>
                 </button>
                 <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="jIg-Xc-Qbw">
-                    <rect key="frame" x="256" y="315" width="159" height="24"/>
+                    <rect key="frame" x="256" y="288" width="159" height="24"/>
                     <segmentedCell key="cell" borderStyle="border" alignment="left" style="rounded" trackingMode="selectOne" id="Rdk-FP-9v8">
                         <font key="font" metaFont="system"/>
                         <segments>
@@ -56,7 +55,7 @@
                     </segmentedCell>
                 </segmentedControl>
                 <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="Kuw-aQ-8xH">
-                    <rect key="frame" x="176" y="79" width="193" height="37"/>
+                    <rect key="frame" x="176" y="52" width="193" height="37"/>
                     <view key="contentView" id="c0z-Nc-3cP">
                         <rect key="frame" x="1" y="1" width="191" height="35"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -94,7 +93,7 @@
                     </constraints>
                 </box>
                 <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="bmw-w2-81i">
-                    <rect key="frame" x="176" y="135" width="193" height="37"/>
+                    <rect key="frame" x="176" y="108" width="193" height="37"/>
                     <view key="contentView" id="A7G-pB-dME">
                         <rect key="frame" x="1" y="1" width="191" height="35"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -129,7 +128,7 @@
                     </view>
                 </box>
                 <box boxType="custom" cornerRadius="4" title="Box" translatesAutoresizingMaskIntoConstraints="NO" id="l1p-kb-Dga">
-                    <rect key="frame" x="176" y="192" width="193" height="37"/>
+                    <rect key="frame" x="176" y="165" width="193" height="37"/>
                     <view key="contentView" id="nCg-8V-yCx">
                         <rect key="frame" x="1" y="1" width="191" height="35"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -180,7 +179,7 @@
                     </view>
                 </box>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="QZa-7i-ghA">
-                    <rect key="frame" x="11" y="262" width="233" height="17"/>
+                    <rect key="frame" x="11" y="235" width="233" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="Ignore sleeps shorter than 10 minutes" id="CUp-FW-k1J">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -188,14 +187,14 @@
                     </textFieldCell>
                 </textField>
                 <slider verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="tN8-4C-2i5">
-                    <rect key="frame" x="256" y="261" width="159" height="24"/>
+                    <rect key="frame" x="256" y="234" width="159" height="24"/>
                     <sliderCell key="cell" continuous="YES" state="on" alignment="left" minValue="5" maxValue="30" doubleValue="13" tickMarkPosition="above" numberOfTickMarks="10" sliderType="linear" id="DzM-oD-W38"/>
                     <connections>
                         <action selector="handleMinSleepDuration:" target="c22-O7-iKe" id="Aah-HW-b2s"/>
                     </connections>
                 </slider>
                 <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="eXx-ul-UhD">
-                    <rect key="frame" x="388" y="203" width="109" height="17"/>
+                    <rect key="frame" x="388" y="176" width="109" height="17"/>
                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="(excluding lunch)" id="hTJ-hO-7NI">
                         <font key="font" metaFont="system"/>
                         <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
@@ -232,7 +231,7 @@
                 <constraint firstItem="wac-II-n6f" firstAttribute="top" secondItem="HF2-Ra-st6" secondAttribute="bottom" constant="43" id="o4o-Ul-oEg"/>
                 <constraint firstItem="l1p-kb-Dga" firstAttribute="trailing" secondItem="bmw-w2-81i" secondAttribute="trailing" id="oz2-Rn-c4W"/>
                 <constraint firstItem="QZa-7i-ghA" firstAttribute="top" secondItem="UNt-JQ-D2v" secondAttribute="bottom" constant="42" id="qql-8J-jZ6"/>
-                <constraint firstItem="UNt-JQ-D2v" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="23" id="t0B-hr-fXc"/>
+                <constraint firstItem="UNt-JQ-D2v" firstAttribute="top" secondItem="c22-O7-iKe" secondAttribute="top" constant="50" id="t0B-hr-fXc"/>
                 <constraint firstItem="bmw-w2-81i" firstAttribute="trailing" secondItem="Kuw-aQ-8xH" secondAttribute="trailing" id="tcG-0A-Puc"/>
             </constraints>
             <connections>
diff --git a/Delivery/macOS/Screens/Tasks/Tasks.storyboard b/Delivery/macOS/Screens/Tasks/Tasks.storyboard
index dfd88dc..193b7cb 100644
--- a/Delivery/macOS/Screens/Tasks/Tasks.storyboard
+++ b/Delivery/macOS/Screens/Tasks/Tasks.storyboard
@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="wHU-IX-gfU">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="wHU-IX-gfU">
     <dependencies>
-        <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="13771"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -151,34 +150,6 @@
                                     <real value="250"/>
                                 </holdingPriorities>
                             </splitView>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="rhx-UQ-KmF">
-                                <rect key="frame" x="7" y="398" width="24" height="24"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="24" id="UPH-5F-Pfw"/>
-                                    <constraint firstAttribute="height" constant="24" id="nf4-3J-Lbd"/>
-                                </constraints>
-                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ButClose" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="At4-An-7dD">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="handleQuitAppButton:" target="wHU-IX-gfU" id="1xF-Xg-9zG"/>
-                                </connections>
-                            </button>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="6Em-gu-4cj">
-                                <rect key="frame" x="30" y="398" width="24" height="24"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="24" id="00Y-zk-eER"/>
-                                    <constraint firstAttribute="height" constant="24" id="umL-wH-4FS"/>
-                                </constraints>
-                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ButMinimize" imagePosition="only" alignment="center" alternateImage="ButMinimize" imageScaling="proportionallyDown" inset="2" id="bPg-k2-O5r">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                                <connections>
-                                    <action selector="handleMinimizeAppButton:" target="wHU-IX-gfU" id="fTq-Ud-XRG"/>
-                                </connections>
-                            </button>
                             <segmentedControl verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="95a-7I-VNJ">
                                 <rect key="frame" x="173" y="399" width="146" height="23"/>
                                 <segmentedCell key="cell" borderStyle="border" alignment="left" style="texturedSquare" trackingMode="selectOne" id="fYS-Rm-Q7V">
@@ -192,17 +163,6 @@
                                     <action selector="handleSegmentedControl:" target="wHU-IX-gfU" id="1hR-gG-H11"/>
                                 </connections>
                             </segmentedControl>
-                            <button translatesAutoresizingMaskIntoConstraints="NO" id="PZL-RZ-Mym">
-                                <rect key="frame" x="53" y="398" width="24" height="24"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="24" id="OQQ-Tx-zmt"/>
-                                    <constraint firstAttribute="height" constant="24" id="dHv-4q-uIG"/>
-                                </constraints>
-                                <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="ButDisabled" imagePosition="only" alignment="center" alternateImage="ButDisabled" imageScaling="proportionallyDown" inset="2" id="IPE-Op-n48">
-                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                    <font key="font" metaFont="system"/>
-                                </buttonCell>
-                            </button>
                             <progressIndicator wantsLayer="YES" horizontalHuggingPriority="750" verticalHuggingPriority="750" maxValue="100" displayedWhenStopped="NO" bezeled="NO" indeterminate="YES" controlSize="small" style="spinning" translatesAutoresizingMaskIntoConstraints="NO" id="lYQ-Lm-GnG">
                                 <rect key="frame" x="438" y="403" width="16" height="16"/>
                             </progressIndicator>
@@ -220,35 +180,52 @@
                                     <action selector="handleRefreshButton:" target="wHU-IX-gfU" id="NFp-1V-gaM"/>
                                 </connections>
                             </button>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dKg-L3-iYb">
+                                <rect key="frame" x="12" y="401" width="38" height="19"/>
+                                <buttonCell key="cell" type="roundRect" title="Quit" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Rbt-IB-xge">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="cellTitle"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="handleQuitAppButton:" target="wHU-IX-gfU" id="Unl-fe-pMn"/>
+                                </connections>
+                            </button>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="uwg-ZV-XEf">
+                                <rect key="frame" x="60" y="401" width="20" height="19"/>
+                                <buttonCell key="cell" type="roundRect" title="^" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="XAx-PW-mjs">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="cellTitle"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="handleMinimizeAppButton:" target="wHU-IX-gfU" id="8JQ-19-WTf"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <constraints>
                             <constraint firstItem="lYQ-Lm-GnG" firstAttribute="centerY" secondItem="GOP-YB-kkJ" secondAttribute="centerY" id="1Vd-we-oBW"/>
-                            <constraint firstItem="PZL-RZ-Mym" firstAttribute="top" secondItem="FwC-dy-0bY" secondAttribute="top" constant="20" id="7Lu-To-KpL"/>
+                            <constraint firstItem="uwg-ZV-XEf" firstAttribute="centerY" secondItem="dKg-L3-iYb" secondAttribute="centerY" id="3m4-yi-xBZ"/>
                             <constraint firstItem="95a-7I-VNJ" firstAttribute="top" secondItem="FwC-dy-0bY" secondAttribute="top" constant="20" id="BIc-JC-FRc"/>
+                            <constraint firstItem="dKg-L3-iYb" firstAttribute="top" secondItem="FwC-dy-0bY" secondAttribute="top" constant="22" id="EDa-6H-Km8"/>
                             <constraint firstAttribute="trailing" secondItem="sOM-pv-IVs" secondAttribute="trailing" constant="12" id="EDp-gv-hVw"/>
                             <constraint firstItem="sOM-pv-IVs" firstAttribute="top" secondItem="FwC-dy-0bY" secondAttribute="top" constant="20" id="IOj-nH-o5u"/>
                             <constraint firstAttribute="trailing" secondItem="pVs-CS-Pcx" secondAttribute="trailing" id="Txh-8R-Xmj"/>
-                            <constraint firstItem="rhx-UQ-KmF" firstAttribute="top" secondItem="FwC-dy-0bY" secondAttribute="top" constant="20" id="Xmr-U7-0TU"/>
+                            <constraint firstItem="uwg-ZV-XEf" firstAttribute="leading" secondItem="dKg-L3-iYb" secondAttribute="trailing" constant="10" id="Uqr-uo-mGH"/>
                             <constraint firstItem="SJz-Xr-YhG" firstAttribute="leading" secondItem="FwC-dy-0bY" secondAttribute="leading" constant="12" id="c6a-uG-6en"/>
                             <constraint firstAttribute="bottom" secondItem="pVs-CS-Pcx" secondAttribute="bottom" id="jOP-OI-xoU"/>
-                            <constraint firstItem="rhx-UQ-KmF" firstAttribute="leading" secondItem="FwC-dy-0bY" secondAttribute="leading" constant="7" id="k7t-tb-cZf"/>
                             <constraint firstItem="SJz-Xr-YhG" firstAttribute="top" secondItem="FwC-dy-0bY" secondAttribute="top" constant="60" id="kgn-ml-hof"/>
                             <constraint firstItem="95a-7I-VNJ" firstAttribute="centerX" secondItem="FwC-dy-0bY" secondAttribute="centerX" id="lHI-TJ-Zn1"/>
                             <constraint firstAttribute="trailing" secondItem="SJz-Xr-YhG" secondAttribute="trailing" constant="12" id="leq-Tf-xCq"/>
-                            <constraint firstItem="PZL-RZ-Mym" firstAttribute="leading" secondItem="rhx-UQ-KmF" secondAttribute="trailing" constant="22" id="m8X-lr-c5u"/>
-                            <constraint firstItem="6Em-gu-4cj" firstAttribute="top" secondItem="FwC-dy-0bY" secondAttribute="top" constant="20" id="nTL-hi-2Or"/>
+                            <constraint firstItem="dKg-L3-iYb" firstAttribute="leading" secondItem="FwC-dy-0bY" secondAttribute="leading" constant="12" id="nTc-sS-BE0"/>
                             <constraint firstItem="pVs-CS-Pcx" firstAttribute="top" secondItem="FwC-dy-0bY" secondAttribute="top" constant="62" id="rPW-Au-hGz"/>
                             <constraint firstItem="lYQ-Lm-GnG" firstAttribute="centerX" secondItem="GOP-YB-kkJ" secondAttribute="centerX" id="tnZ-eU-hgu"/>
-                            <constraint firstItem="6Em-gu-4cj" firstAttribute="leading" secondItem="FwC-dy-0bY" secondAttribute="leading" constant="30" id="w02-IC-8NC"/>
                             <constraint firstItem="GOP-YB-kkJ" firstAttribute="top" secondItem="sOM-pv-IVs" secondAttribute="top" id="xFb-Fn-yNs"/>
                             <constraint firstItem="pVs-CS-Pcx" firstAttribute="leading" secondItem="FwC-dy-0bY" secondAttribute="leading" constant="12" id="xh1-lJ-1K2"/>
                             <constraint firstItem="sOM-pv-IVs" firstAttribute="leading" secondItem="GOP-YB-kkJ" secondAttribute="trailing" id="yab-oA-B2u"/>
                         </constraints>
                     </customView>
                     <connections>
-                        <outlet property="butFullScreen" destination="PZL-RZ-Mym" id="Ao4-DV-ynR"/>
-                        <outlet property="butMinimize" destination="6Em-gu-4cj" id="09K-jk-iiO"/>
-                        <outlet property="butQuit" destination="rhx-UQ-KmF" id="vrD-UN-ztp"/>
+                        <outlet property="butMinimize" destination="uwg-ZV-XEf" id="n7a-2i-PGD"/>
+                        <outlet property="butQuit" destination="dKg-L3-iYb" id="UTl-h4-8iX"/>
                         <outlet property="butRefresh" destination="GOP-YB-kkJ" id="okT-iV-BcZ"/>
                         <outlet property="butSettings" destination="sOM-pv-IVs" id="kgx-pV-DJa"/>
                         <outlet property="calendarScrollView" destination="TP3-Rr-lmx" id="Zzl-gR-bBE"/>
@@ -370,9 +347,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="ButClose" width="13" height="13"/>
-        <image name="ButDisabled" width="13" height="13"/>
-        <image name="ButMinimize" width="13" height="13"/>
         <image name="NSActionTemplate" width="14" height="14"/>
         <image name="NSRefreshTemplate" width="11" height="15"/>
     </resources>
diff --git a/Delivery/macOS/Screens/Tasks/TasksViewController.swift b/Delivery/macOS/Screens/Tasks/TasksViewController.swift
index 13f5b91..6caa296 100644
--- a/Delivery/macOS/Screens/Tasks/TasksViewController.swift
+++ b/Delivery/macOS/Screens/Tasks/TasksViewController.swift
@@ -18,7 +18,6 @@ class TasksViewController: NSViewController {
     @IBOutlet fileprivate weak var butSettings: NSButton!
     @IBOutlet fileprivate weak var butQuit: NSButton!
     @IBOutlet fileprivate weak var butMinimize: NSButton!
-    @IBOutlet fileprivate weak var butFullScreen: NSButton!
     @IBOutlet fileprivate weak var refreshIndicator: NSProgressIndicator!
     
     weak var appWireframe: AppWireframe?
@@ -56,7 +55,6 @@ class TasksViewController: NSViewController {
         butRefresh.isHidden = remoteRepository == nil ? true : hide
         butQuit.isHidden = hide
         butMinimize.isHidden = hide
-        butFullScreen.isHidden = hide
         listSegmentedControl.isHidden = hide
     }
 }
diff --git a/Delivery/macOS/Screens/Welcome/Welcome.storyboard b/Delivery/macOS/Screens/Welcome/Welcome.storyboard
index b1097ee..a6deba5 100644
--- a/Delivery/macOS/Screens/Welcome/Welcome.storyboard
+++ b/Delivery/macOS/Screens/Welcome/Welcome.storyboard
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <deployment identifier="macosx"/>
         <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14109"/>
         <capability name="box content view" minToolsVersion="7.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -114,26 +113,51 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="LIy-LY-WEx">
+                                <rect key="frame" x="12" y="444" width="38" height="19"/>
+                                <buttonCell key="cell" type="roundRect" title="Quit" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="K5I-qP-jKc">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="cellTitle"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="handleQuitAppButton:" target="JD0-O4-EsS" id="niC-MV-r7t"/>
+                                </connections>
+                            </button>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="PmU-1L-wKw">
+                                <rect key="frame" x="60" y="444" width="20" height="19"/>
+                                <buttonCell key="cell" type="roundRect" title="^" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="jSj-Fb-RVz">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="cellTitle"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="handleMinimizeAppButton:" target="JD0-O4-EsS" id="91u-66-h8l"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <constraints>
                             <constraint firstItem="ERS-BC-qGc" firstAttribute="centerY" secondItem="vMb-6z-kGp" secondAttribute="centerY" constant="40" id="86N-e6-fiH"/>
                             <constraint firstItem="Pcq-Wr-CsI" firstAttribute="leading" secondItem="vMb-6z-kGp" secondAttribute="leading" id="9Z5-QL-WIS"/>
+                            <constraint firstItem="PmU-1L-wKw" firstAttribute="centerY" secondItem="LIy-LY-WEx" secondAttribute="centerY" id="CzS-uM-RhZ"/>
                             <constraint firstItem="ueF-Jd-dYA" firstAttribute="centerY" secondItem="NIA-cX-7Yi" secondAttribute="centerY" id="Ftg-Ya-frZ"/>
                             <constraint firstAttribute="trailing" secondItem="epJ-lR-g9d" secondAttribute="trailing" id="MnE-uW-Gt6"/>
+                            <constraint firstItem="LIy-LY-WEx" firstAttribute="top" secondItem="vMb-6z-kGp" secondAttribute="top" constant="22" id="O4Y-tp-HIS"/>
                             <constraint firstItem="NIA-cX-7Yi" firstAttribute="trailing" secondItem="vE6-Oq-Bat" secondAttribute="trailing" id="O9v-VW-mqN"/>
                             <constraint firstAttribute="bottom" secondItem="NIA-cX-7Yi" secondAttribute="bottom" constant="32" id="QI4-Ev-4fb"/>
                             <constraint firstAttribute="trailing" secondItem="Pcq-Wr-CsI" secondAttribute="trailing" id="QS6-Pg-5Qg"/>
                             <constraint firstItem="ERS-BC-qGc" firstAttribute="centerX" secondItem="vMb-6z-kGp" secondAttribute="centerX" id="TGh-GL-ErM"/>
+                            <constraint firstItem="PmU-1L-wKw" firstAttribute="leading" secondItem="LIy-LY-WEx" secondAttribute="trailing" constant="10" id="TVS-2P-2X5"/>
                             <constraint firstItem="3oK-tV-cbq" firstAttribute="leading" secondItem="vMb-6z-kGp" secondAttribute="leading" id="Ta5-iV-ryj"/>
                             <constraint firstItem="Pcq-Wr-CsI" firstAttribute="top" secondItem="vMb-6z-kGp" secondAttribute="top" constant="60" id="Z82-jA-C7G"/>
                             <constraint firstItem="3oK-tV-cbq" firstAttribute="top" secondItem="Pcq-Wr-CsI" secondAttribute="bottom" constant="10" id="hMl-O3-Wo5"/>
                             <constraint firstAttribute="trailing" secondItem="3oK-tV-cbq" secondAttribute="trailing" id="jb9-dB-DyB"/>
                             <constraint firstItem="epJ-lR-g9d" firstAttribute="leading" secondItem="vMb-6z-kGp" secondAttribute="leading" id="nxL-FW-UWH"/>
+                            <constraint firstItem="LIy-LY-WEx" firstAttribute="leading" secondItem="vMb-6z-kGp" secondAttribute="leading" constant="12" id="qMQ-qh-wOO"/>
                             <constraint firstItem="NIA-cX-7Yi" firstAttribute="leading" secondItem="ueF-Jd-dYA" secondAttribute="trailing" constant="10" id="x6E-Ki-owr"/>
                             <constraint firstItem="epJ-lR-g9d" firstAttribute="top" secondItem="3oK-tV-cbq" secondAttribute="bottom" constant="10" id="xn7-VU-d12"/>
                         </constraints>
                     </view>
                     <connections>
+                        <outlet property="box" destination="ERS-BC-qGc" id="MVx-zR-KO7"/>
                         <outlet property="butSettings" destination="Iwt-cC-1rr" id="RFO-Z4-6TQ"/>
                         <outlet property="butStart" destination="NIA-cX-7Yi" id="z1a-pU-zcU"/>
                     </connections>
@@ -197,11 +221,35 @@
                                     <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                 </textFieldCell>
                             </textField>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="dLe-ZF-F9D">
+                                <rect key="frame" x="12" y="443" width="38" height="19"/>
+                                <buttonCell key="cell" type="roundRect" title="Quit" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="JFI-fO-QQm">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="cellTitle"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="handleQuitAppButton:" target="DoA-87-gY5" id="9Hr-AF-E4y"/>
+                                </connections>
+                            </button>
+                            <button verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="MOy-l9-bU0">
+                                <rect key="frame" x="60" y="443" width="20" height="19"/>
+                                <buttonCell key="cell" type="roundRect" title="^" bezelStyle="roundedRect" alignment="center" state="on" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="ino-VC-Wlu">
+                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                    <font key="font" metaFont="cellTitle"/>
+                                </buttonCell>
+                                <connections>
+                                    <action selector="handleMinimizeAppButton:" target="DoA-87-gY5" id="bce-jb-BPy"/>
+                                </connections>
+                            </button>
                         </subviews>
                         <constraints>
+                            <constraint firstItem="MOy-l9-bU0" firstAttribute="centerY" secondItem="dLe-ZF-F9D" secondAttribute="centerY" id="76t-qy-APB"/>
+                            <constraint firstItem="dLe-ZF-F9D" firstAttribute="leading" secondItem="hxG-ku-CMn" secondAttribute="leading" constant="12" id="AmE-Bf-5NB"/>
                             <constraint firstItem="cHg-Ny-SMJ" firstAttribute="top" secondItem="hxG-ku-CMn" secondAttribute="top" constant="72" id="B4v-et-YoF"/>
                             <constraint firstAttribute="trailing" secondItem="cHg-Ny-SMJ" secondAttribute="trailing" id="D5U-S7-6KS"/>
+                            <constraint firstItem="MOy-l9-bU0" firstAttribute="leading" secondItem="dLe-ZF-F9D" secondAttribute="trailing" constant="10" id="ECg-kQ-rrG"/>
                             <constraint firstItem="b3I-CK-kNW" firstAttribute="centerY" secondItem="hxG-ku-CMn" secondAttribute="centerY" constant="40" id="Hxf-pq-YtM"/>
+                            <constraint firstItem="dLe-ZF-F9D" firstAttribute="top" secondItem="hxG-ku-CMn" secondAttribute="top" constant="22" id="K0J-ZJ-U1I"/>
                             <constraint firstItem="cHg-Ny-SMJ" firstAttribute="leading" secondItem="hxG-ku-CMn" secondAttribute="leading" id="Lku-ei-MQQ"/>
                             <constraint firstAttribute="trailing" secondItem="jEi-lE-OZv" secondAttribute="trailing" constant="40" id="UdE-lA-jyr"/>
                             <constraint firstAttribute="bottom" secondItem="LWS-Sc-Yau" secondAttribute="bottom" constant="32" id="Z6o-hh-FZr"/>
diff --git a/Delivery/macOS/Screens/Welcome/WelcomeViewController.swift b/Delivery/macOS/Screens/Welcome/WelcomeViewController.swift
index 0e1c8b0..1171275 100644
--- a/Delivery/macOS/Screens/Welcome/WelcomeViewController.swift
+++ b/Delivery/macOS/Screens/Welcome/WelcomeViewController.swift
@@ -11,6 +11,7 @@ import Cocoa
 class WelcomeViewController: NSViewController {
     
     weak var appWireframe: AppWireframe?
+    @IBOutlet var box: NSBox!
     @IBOutlet var butSettings: NSButton!
     @IBOutlet var butStart: NSButton!
     fileprivate let localPreferences = RCPreferences<LocalPreferences>()
@@ -18,6 +19,9 @@ class WelcomeViewController: NSViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         createLayer()
+        if AppTheme().isDark {
+            box.fillColor = NSColor.clear
+        }
     }
     
     deinit {
@@ -26,14 +30,22 @@ class WelcomeViewController: NSViewController {
     
     @IBAction func handleStartButton (_ sender: NSButton) {
         localPreferences.set(false, forKey: .firstLaunch, version: Versioning.appVersion)
+        localPreferences.set(WizardStep.finished.rawValue, forKey: .wizardStep)
         appWireframe!.flipToTasksController()
     }
     
     @IBAction func handleSettingsButton (_ sender: NSButton) {
         localPreferences.set(false, forKey: .firstLaunch, version: Versioning.appVersion)
-        localPreferences.set(1, forKey: .settingsActiveTab)
         appWireframe!.flipToWizardController()
     }
+    
+    @IBAction func handleQuitAppButton (_ sender: NSButton) {
+        NSApplication.shared.terminate(nil)
+    }
+    
+    @IBAction func handleMinimizeAppButton (_ sender: NSButton) {
+        AppDelegate.sharedApp().menu.triggerClose()
+    }
 }
 
 extension WelcomeViewController: Animatable {
diff --git a/Delivery/macOS/Screens/Welcome/WizardViewController.swift b/Delivery/macOS/Screens/Welcome/WizardViewController.swift
index cc7a633..26ae036 100644
--- a/Delivery/macOS/Screens/Welcome/WizardViewController.swift
+++ b/Delivery/macOS/Screens/Welcome/WizardViewController.swift
@@ -139,6 +139,14 @@ class WizardViewController: NSViewController {
         localPreferences.set(WizardStep.finished.rawValue, forKey: .wizardStep)
         appWireframe!.flipToTasksController()
     }
+    
+    @IBAction func handleQuitAppButton (_ sender: NSButton) {
+        NSApplication.shared.terminate(nil)
+    }
+    
+    @IBAction func handleMinimizeAppButton (_ sender: NSButton) {
+        AppDelegate.sharedApp().menu.triggerClose()
+    }
 }
 
 extension WizardViewController: Animatable {
diff --git a/Jirassic.xcodeproj/project.pbxproj b/Jirassic.xcodeproj/project.pbxproj
index e98fdc1..d28b302 100644
--- a/Jirassic.xcodeproj/project.pbxproj
+++ b/Jirassic.xcodeproj/project.pbxproj
@@ -2647,7 +2647,7 @@
 				INFOPLIST_FILE = "$(SRCROOT)/Delivery/macOS/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				OTHER_SWIFT_FLAGS = "-D APPSTORE";
+				OTHER_SWIFT_FLAGS = "-D APPSTORE -D DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = com.jirassic.macos;
 				PRODUCT_NAME = Jirassic;
 				PROVISIONING_PROFILE = "f679af74-4f51-4414-a117-26fcd2203fad";