From 4c32730891ffb5bc4ef7eea6798dedc01017e01c Mon Sep 17 00:00:00 2001
From: Christopher Eklund <eklundchristopher@gmail.com>
Date: Mon, 3 Jul 2017 16:25:20 +0200
Subject: [PATCH] Action controls & beginning of preferences

---
 .../xcschemes/SleepWell.xcscheme              |   6 +-
 SleepWell/Assets.xcassets/Contents.json       |   6 +
 .../PlayButton.imageset/Contents.json         |  23 ++++
 .../icons8-Play Filled-16.png                 | Bin 0 -> 214 bytes
 .../icons8-Play Filled-32.png                 | Bin 0 -> 341 bytes
 .../icons8-Play Filled-64.png                 | Bin 0 -> 589 bytes
 .../RestartButton.imageset/Contents.json      |  23 ++++
 .../RestartButton.imageset/restart16.png      | Bin 0 -> 1749 bytes
 .../RestartButton.imageset/restart32.png      | Bin 0 -> 3018 bytes
 .../RestartButton.imageset/restart64.png      | Bin 0 -> 5510 bytes
 .../StopButton.imageset/Contents.json         |  23 ++++
 .../icons8-Stop Filled-16.png                 | Bin 0 -> 132 bytes
 .../icons8-Stop Filled-32.png                 | Bin 0 -> 126 bytes
 .../icons8-Stop Filled-64.png                 | Bin 0 -> 292 bytes
 SleepWell/Base.lproj/Main.storyboard          | 108 +++++++++++++++---
 SleepWell/MenubarController.swift             |  43 +++++--
 16 files changed, 207 insertions(+), 25 deletions(-)
 create mode 100644 SleepWell/Assets.xcassets/Contents.json
 create mode 100644 SleepWell/Assets.xcassets/PlayButton.imageset/Contents.json
 create mode 100644 SleepWell/Assets.xcassets/PlayButton.imageset/icons8-Play Filled-16.png
 create mode 100644 SleepWell/Assets.xcassets/PlayButton.imageset/icons8-Play Filled-32.png
 create mode 100644 SleepWell/Assets.xcassets/PlayButton.imageset/icons8-Play Filled-64.png
 create mode 100644 SleepWell/Assets.xcassets/RestartButton.imageset/Contents.json
 create mode 100644 SleepWell/Assets.xcassets/RestartButton.imageset/restart16.png
 create mode 100644 SleepWell/Assets.xcassets/RestartButton.imageset/restart32.png
 create mode 100644 SleepWell/Assets.xcassets/RestartButton.imageset/restart64.png
 create mode 100644 SleepWell/Assets.xcassets/StopButton.imageset/Contents.json
 create mode 100644 SleepWell/Assets.xcassets/StopButton.imageset/icons8-Stop Filled-16.png
 create mode 100644 SleepWell/Assets.xcassets/StopButton.imageset/icons8-Stop Filled-32.png
 create mode 100644 SleepWell/Assets.xcassets/StopButton.imageset/icons8-Stop Filled-64.png

diff --git a/SleepWell.xcodeproj/xcuserdata/eklundchristopher.xcuserdatad/xcschemes/SleepWell.xcscheme b/SleepWell.xcodeproj/xcuserdata/eklundchristopher.xcuserdatad/xcschemes/SleepWell.xcscheme
index 5a1536c..a9ff54f 100644
--- a/SleepWell.xcodeproj/xcuserdata/eklundchristopher.xcuserdatad/xcschemes/SleepWell.xcscheme
+++ b/SleepWell.xcodeproj/xcuserdata/eklundchristopher.xcuserdatad/xcschemes/SleepWell.xcscheme
@@ -42,9 +42,9 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Release"
-      selectedDebuggerIdentifier = ""
-      selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
diff --git a/SleepWell/Assets.xcassets/Contents.json b/SleepWell/Assets.xcassets/Contents.json
new file mode 100644
index 0000000..da4a164
--- /dev/null
+++ b/SleepWell/Assets.xcassets/Contents.json
@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/SleepWell/Assets.xcassets/PlayButton.imageset/Contents.json b/SleepWell/Assets.xcassets/PlayButton.imageset/Contents.json
new file mode 100644
index 0000000..ab35b54
--- /dev/null
+++ b/SleepWell/Assets.xcassets/PlayButton.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icons8-Play Filled-16.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icons8-Play Filled-32.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icons8-Play Filled-64.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/SleepWell/Assets.xcassets/PlayButton.imageset/icons8-Play Filled-16.png b/SleepWell/Assets.xcassets/PlayButton.imageset/icons8-Play Filled-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..a8940ef357b2cf8aa7bfdbd05a89af0fd62537b6
GIT binary patch
literal 214
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`b3I)gLoEE)PQEMHWFXLDZ?!==
zx{+@K^BV`N34R-xbQ!HD@XeTe@~nlYfqjL3<%u`b@7{?$d@#%AFXxXb2DJxxY#Oum
zG}tVx3;BIC&8rzMpPYE-MNb%4!XoQ}&ZDPTIhLH4ZTNWGi}OGU_l3wcQU|0nvKdx)
z7p(4FP_}CA!3j&1Z039jz2$cEYIoNC^Iet~E@-4*^ZQdfGpMimH*c4-nqb^F-DN<B
OGI+ZBxvX<aXaWEsUQ~nt

literal 0
HcmV?d00001

diff --git a/SleepWell/Assets.xcassets/PlayButton.imageset/icons8-Play Filled-32.png b/SleepWell/Assets.xcassets/PlayButton.imageset/icons8-Play Filled-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..4f82ca39eb3eca2143ca7d2f309b2d149ed5438e
GIT binary patch
literal 341
zcmV-b0jmCqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80003TNkl<ZSVzs5
z;Sm8b5QV?%NJ&(H3eW)^&;cFL0Ugi*9hf(h{bAhYE^d?98UKv;WjF7wG*qspvOa$e
zFahqsGiR4#9asZ%U;!L*LG%Hvg76hs0%vcKp#Y}44<K%1Nd*vy#J9l4qZ_{fn6579
zZ0uOZ02s(Ij731n<pE%#a?LK)ww?e2Q5WPEb!AX_1DL4nDiGN>TDbsB)ZEf(+uQ(V
z+s-sC0bt!|P1BM9x3E_};=BaFD+nvbzbZF?azXh}{1RTmsf*k25rnG*k+!3JpR}qy
z?!YOWy7)3uyQekQv23MQ>voT>)Dh^<sbV#0&N0fN0IexD`uGrin5e}%tv;<OmK&h@
n!^Go&y}$9-Z^K@Ck1xCdX>Cd&8_&-u00000NkvXXu0mjfMbnb3

literal 0
HcmV?d00001

diff --git a/SleepWell/Assets.xcassets/PlayButton.imageset/icons8-Play Filled-64.png b/SleepWell/Assets.xcassets/PlayButton.imageset/icons8-Play Filled-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..02f35ca25260a6e4860fc3f3f5902a8993692ddc
GIT binary patch
literal 589
zcmV-T0<!&yP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF0006MNkl<ZcwX(B
zJxc^J5Qd*?{Wbn81q%@rtpo+J5Cz4~Mo|#tIvZO{E3vcDMjI^^1VK~=6Szt)*?dfP
zcI(|u-sfg=?@Y2Ij9(+;`WXNW5n!CakOC0_Favx<Jg4%Jm<X5!&VhO0TBWLhNyP%V
zbz_WyCEz(=OjWmb1t4N19kziT;8T^lDJGKwfFI@&SOBi37+1|LDFJv<0zlH@UX99s
zCXxey4EF^b0_(uLW)Qgmc+D@s8gK&qXatcPfY*Ej%mH`WAd~_iy1#)Vmlm&DK$HaF
zHNOEHz=2yUs<Nm7zzddtiRx~$CIAnjs+-gRVA4(Ql`gcj0PxZ91S|s=r4|Nl0K9Ig
zGG%?p?k2SYDCQ<L11RDqTL3WWCKmy5mC3G_0ElR*Cr*JCAc>o74M1`?*(!i!ZnAX%
zlWuYqkginF)fWIFTKbW@z*dNx>=S?}H`zx3L2hyY5VT_a-7Gspeq$u!@$8QT6;yqS
z0Mm=0G*wLg4R&s;wVDFbSltBnyEax^10coFnd=&vD~6;DHdzj5-Con20!21hwE{5P
z6n$`K3of(!MK^$!2&i_<Mgst|TVtJFT#7WQ5dq0uTx$SKACNG6L?)|?)0_fDT%1+_
zW)Di5Jt|wx#c4=^sxGc3fMeI3F!{lR`A=q2M4p;=#MA<6CZA#=1Ar71TYkq70WJS}
bDdzqQ`m(G+S(wv+00000NkvXXu0mjfV-e|v

literal 0
HcmV?d00001

diff --git a/SleepWell/Assets.xcassets/RestartButton.imageset/Contents.json b/SleepWell/Assets.xcassets/RestartButton.imageset/Contents.json
new file mode 100644
index 0000000..86a721a
--- /dev/null
+++ b/SleepWell/Assets.xcassets/RestartButton.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "restart16.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "restart32.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "restart64.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/SleepWell/Assets.xcassets/RestartButton.imageset/restart16.png b/SleepWell/Assets.xcassets/RestartButton.imageset/restart16.png
new file mode 100644
index 0000000000000000000000000000000000000000..d92366e8cf4cc8b53a456e978559477650dd7f24
GIT binary patch
literal 1749
zcmaJ?Yfuwc6b>q=h$D&t1S>m1MH!NiO#&n&K%RmSN+BSiJYurIR+3G#iwPp>C=W$I
z5Rr#QM1g|S!P3e20E$);0gGa-r4$@zTD1xaG98BsDAElI_J?+7ckjJt&i9?~o^$Tp
zf{5^KD{WnD2?WB*kYHgXKH6KpWj6TV?d7ZtAJ$=_SS$)j!L%|BMBpiq-4GC>l%+zE
zkW7*J)lG;)AT0KTrLkD7B#bRbloXl8hoV!eaWsLz3Dl`&@;wj+?1oZd6_+&LevJgc
z3NC2}Q{pXA3!pSOc%KG}+7~XB@7p71DM*0<07u8h36u~f19ZxC70T9eNprkxd~PvQ
zNx+;7wuei4Cn{DF0SFKc1TZN+WI2rv0=_H?jmZN27+wJAP4l68GpIBcnMP;hFT)#n
z|B&!#8bt~_QYd~O3tw?bX&9zvQ>j|5mZGIo5KStMWwEH<AQc43xCa@{RADk5S%tdK
zGYBD6u7TAUjHmz$qii>lfpJN=(sx@>suyTg==(I`38U&{YATK5ZQ0ViqeSxmu1e*C
zH;P3<AM}2d7?ozKA!;OqA{iPvUbqx@ODHv4pn+r<qLCs<`g|56(hv+m(-1Wv5LmLt
zq%eUk5}6!US<GAKa1seSM1^89l^hBYa!EK71%?%D9!T>Q@Pu@xA5B1`iG2M)9z*Es
zM`QW<h-rML&pcL$$TO6X3Y*6&K42N2#9CTHsm3D<Aq~72QiwH(5}4aM8~&IUmLEgl
z&A0IJKd$8+R`F>q;3u_EaWPa&f&WwRc@y46mgz$K;){g?0IBe<*Wm44y~D5?KQ+7%
zAy29s;zT6`AD68ScztPVy!<@+a8(y}a)fW!5nNIGp!|!_LkWj@o0nfq_*GJxaIq;j
zxYT^=haP|W-{Lm4XE>w!$k*rLxAm%~tuK+b+t(%xC8K$j<1>9(HE7LK!^`b$?d`B$
zU*qEH8uHzMLq%VTF`9k4@06>ntBa4htBYdp?$-YC)<N%~{=C1xzr3uB4^Cf}dJ+f6
z{&8}5cXvE<$786|WGb2LJ<xJHDk|!U!C-Kiyc*Db^Nl`GBoeI#ubwd&_WvYqj(JU^
zQpb(_v(8UvXJ%%4b8>QsD2kRWwXyMvi;LTyTtkaFTvW7im$S1SfyrR(I%GOtSLdD;
z5m8#=TX9;szdK;G*SX7f=gysF)6>&7eNud;Vz@NZ>2yr34)XBuc=&{VfAVPd@0GNo
z6XI>#p8NazO9~1K0t*WZ-HMMM{bgv#MI;p3M{xoI95>k>3`!RDunXcJ<UCd+w>PXQ
zc-(6G^UA^DVry$_uA#Z5r8L4TJ~7cT$80v+zc3r)o4@Jk;7*v$xf^&LU`hA!>*e*4
zBOIT+{QR<k=bNg-#Djx_=FealKAW4n1a!8`JsE)@<J7Jz4_<_=i)S7&>b2Teot>SF
zE{EM3*0gTfxKUWYVf}iq--7Dy+Na&?>k9{$miGSjh_Bb{{b!4ci%*=(CS7T6E_QTs
z5{+3|S(TTU3v0tnCKIO91;>2b-{TxS<GGedoZt;S866#Mz$<j0li<Ah*zzrFs?O)<
z=LZCRN%4q{i)+nuOzFCDLs?N-dB2`WB<dR?r(7Sw=}KisVNuL5)`BJ_xiOi{6J#>E
z<3Lg1GQZUCW78WO8#TtkHvp44ap=c*ItX4J#@eQhMkB$l_tnVAh_<QtQhj}H++;Q7
z%?pOF@2a|{>#eP=$gx@|E9+D}1VOn6Y9}TpkScIpN>B+YVQhTd*V@KrZ_tqy&DqPw
zJiS*45)vC48waG((FJ6po5L$7V0&n2)^eY*sx11sq#UE`-mxhYFDN`_sJ}mY@ZLRi
zv8H?WnmCaotm;{9cQ<=&Vc2Geyu7@v&z?OqB-aM<rZN(j{G797(VbgKRyG8u&<mOF
Sjkm`v7fpyLTzG+>eDGf~;;qR5

literal 0
HcmV?d00001

diff --git a/SleepWell/Assets.xcassets/RestartButton.imageset/restart32.png b/SleepWell/Assets.xcassets/RestartButton.imageset/restart32.png
new file mode 100644
index 0000000000000000000000000000000000000000..ccfdc1b7c900f7f692445e59497c990ced390bda
GIT binary patch
literal 3018
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

literal 0
HcmV?d00001

diff --git a/SleepWell/Assets.xcassets/RestartButton.imageset/restart64.png b/SleepWell/Assets.xcassets/RestartButton.imageset/restart64.png
new file mode 100644
index 0000000000000000000000000000000000000000..1549b269c0d8682fa7267abc02d057fd96bb2302
GIT binary patch
literal 5510
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

literal 0
HcmV?d00001

diff --git a/SleepWell/Assets.xcassets/StopButton.imageset/Contents.json b/SleepWell/Assets.xcassets/StopButton.imageset/Contents.json
new file mode 100644
index 0000000..588bfe8
--- /dev/null
+++ b/SleepWell/Assets.xcassets/StopButton.imageset/Contents.json
@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "icons8-Stop Filled-16.png",
+      "scale" : "1x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icons8-Stop Filled-32.png",
+      "scale" : "2x"
+    },
+    {
+      "idiom" : "universal",
+      "filename" : "icons8-Stop Filled-64.png",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/SleepWell/Assets.xcassets/StopButton.imageset/icons8-Stop Filled-16.png b/SleepWell/Assets.xcassets/StopButton.imageset/icons8-Stop Filled-16.png
new file mode 100644
index 0000000000000000000000000000000000000000..2399870c7e1b0ef93004f2e15dda690e546f7b44
GIT binary patch
literal 132
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`-kvUwAr}70DGLM)f>z9Dyve}M
z#>Q5y#A|cnz<~mWC1N)lfc&;9CEkpbgan3_@}>zUJS*n&Ie1F8bTTeT>6tjC^J2%s
dwnuk37}7UL2)Zrk;Q<=U;OXk;vd$@?2>^2ZCHVjV

literal 0
HcmV?d00001

diff --git a/SleepWell/Assets.xcassets/StopButton.imageset/icons8-Stop Filled-32.png b/SleepWell/Assets.xcassets/StopButton.imageset/icons8-Stop Filled-32.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc5eecac90b505ddcab3cd35b2f877807f2f8c0e
GIT binary patch
literal 126
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzS5FtmkO=p;*G~#E7_cxn{L;75
zJn%%*CXBI9mfxsNx&3uJ+cmB^%kFA0?`JV_XkcJuV&M=_a7c(*@KR%4=JkK9Ec-ZP
Yeprhs?sdF-4`?8Rr>mdKI;Vst0PoKw82|tP

literal 0
HcmV?d00001

diff --git a/SleepWell/Assets.xcassets/StopButton.imageset/icons8-Stop Filled-64.png b/SleepWell/Assets.xcassets/StopButton.imageset/icons8-Stop Filled-64.png
new file mode 100644
index 0000000000000000000000000000000000000000..6209bad7fffaca326f194b86e688c319c37df680
GIT binary patch
literal 292
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=uRUEHLn`9l-U{SBY{1j<P<w&n
z47SV|wv_^HD^{5?oO6ES@$*-X>ARz4pXOJke13l8&u?c2(G5G9q7ptc8L(_^5L==B
z!SmCK_U&$UllN##_G~#Y^GRgoOD4neb?d$4SXQj~(jUkeb%4i!WiAu5^Je2KhA-qE
zC_Pbop%pXpP{e{oLSjEO8QKmANH94kWIVX?f``>PfrF<}(I8~zp@bESgn;510(_sD
zC6r_or%8DCs2&qa?&RIzoUQ?6n;jIo{V)9Hxq0)ped|y*(d|4ZF1#T4ujsWfM(sCF
e>3mwq9PtD5A{>vtt^5J>HiM_DpUXO@geCy=1aor$

literal 0
HcmV?d00001

diff --git a/SleepWell/Base.lproj/Main.storyboard b/SleepWell/Base.lproj/Main.storyboard
index 7e7862d..1cae879 100644
--- a/SleepWell/Base.lproj/Main.storyboard
+++ b/SleepWell/Base.lproj/Main.storyboard
@@ -42,32 +42,41 @@
                         <outlet property="intervalStepper" destination="mSB-18-3wR" id="lRm-rs-dmX"/>
                         <outlet property="menubar" destination="asO-AN-rWL" id="5DE-bY-1y2"/>
                         <outlet property="progressbar" destination="oWT-Rs-Itp" id="uV3-Ww-TdQ"/>
+                        <outlet property="restartButton" destination="cHv-YY-fF8" id="qEn-Eu-dT0"/>
+                        <outlet property="startButton" destination="2Bf-ib-nyo" id="nXz-Eg-1Up"/>
+                        <outlet property="stopButton" destination="ux3-Yg-BF3" id="xsw-3h-RHR"/>
                         <outlet property="timerLabel" destination="3TT-Uo-wkQ" id="c1Q-zo-2ig"/>
-                        <outlet property="toggleButton" destination="KXm-JQ-Adn" id="1jO-aT-2Nk"/>
                     </connections>
                 </customObject>
                 <menu id="asO-AN-rWL" userLabel="Menubar">
                     <items>
-                        <menuItem title="Timer View" id="a4c-CE-52D" userLabel="Timer View">
+                        <menuItem title="Timer" id="a4c-CE-52D" userLabel="Timer View">
                             <modifierMask key="keyEquivalentModifierMask"/>
                             <connections>
                                 <outlet property="view" destination="WxJ-5I-PgS" id="D5I-ug-NpP"/>
                             </connections>
                         </menuItem>
-                        <menuItem isSeparatorItem="YES" id="Lvu-RV-Xt9"/>
-                        <menuItem title="Interval" id="eHk-Ko-JLE">
+                        <menuItem title="Actions" id="eHk-Ko-JLE">
                             <modifierMask key="keyEquivalentModifierMask"/>
                             <connections>
-                                <outlet property="view" destination="Q3w-LZ-ipl" id="fek-ba-OLY"/>
+                                <outlet property="view" destination="74f-2z-yDv" id="aaK-9k-YOw"/>
                             </connections>
                         </menuItem>
-                        <menuItem title="Start" id="KXm-JQ-Adn" userLabel="Toggle Countdown">
+                        <menuItem isSeparatorItem="YES" id="ePQ-k2-CvO"/>
+                        <menuItem title="Interval" id="dkx-vy-gcs">
                             <modifierMask key="keyEquivalentModifierMask"/>
                             <connections>
-                                <action selector="toggleTimer:" target="gEe-Vl-JZj" id="oOV-Wc-lB1"/>
+                                <outlet property="view" destination="Q3w-LZ-ipl" id="z9R-rr-a1k"/>
                             </connections>
                         </menuItem>
-                        <menuItem isSeparatorItem="YES" id="fFf-9U-cx3"/>
+                        <menuItem isSeparatorItem="YES" id="6vs-2P-6Lh"/>
+                        <menuItem title="Preferences" id="4YN-Km-ohc">
+                            <modifierMask key="keyEquivalentModifierMask"/>
+                            <connections>
+                                <outlet property="view" destination="C4I-d5-Tb4" id="IiX-os-gW7"/>
+                            </connections>
+                        </menuItem>
+                        <menuItem isSeparatorItem="YES" id="dTa-WJ-cFP"/>
                         <menuItem title="Quit" id="clu-G1-dhh">
                             <modifierMask key="keyEquivalentModifierMask"/>
                             <connections>
@@ -80,11 +89,11 @@
                     </connections>
                 </menu>
                 <customView identifier="TimerView" id="WxJ-5I-PgS" userLabel="Timer">
-                    <rect key="frame" x="0.0" y="0.0" width="163" height="58"/>
+                    <rect key="frame" x="0.0" y="0.0" width="163" height="65"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <subviews>
                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3TT-Uo-wkQ" userLabel="Timer">
-                            <rect key="frame" x="18" y="25" width="127" height="24"/>
+                            <rect key="frame" x="18" y="32" width="127" height="24"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <textFieldCell key="cell" lineBreakMode="truncatingHead" sendsActionOnEndEditing="YES" alignment="center" placeholderString="Stopped" id="1pi-kS-v5V">
                                 <font key="font" metaFont="system" size="20"/>
@@ -93,13 +102,58 @@
                             </textFieldCell>
                         </textField>
                         <progressIndicator identifier="timerprogress" wantsLayer="YES" fixedFrame="YES" maxValue="100" style="bar" translatesAutoresizingMaskIntoConstraints="NO" id="oWT-Rs-Itp">
-                            <rect key="frame" x="20" y="1" width="123" height="20"/>
+                            <rect key="frame" x="20" y="8" width="123" height="20"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                         </progressIndicator>
                     </subviews>
                 </customView>
+                <customView id="74f-2z-yDv" userLabel="Actions">
+                    <rect key="frame" x="0.0" y="0.0" width="163" height="26"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <subviews>
+                        <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2Bf-ib-nyo">
+                            <rect key="frame" x="20" y="10" width="16" height="16"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="PlayButton" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="yTx-58-PSo">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                                <connections>
+                                    <binding destination="gEe-Vl-JZj" name="enabled" keyPath="disabled" id="tDg-UC-2f4"/>
+                                </connections>
+                            </buttonCell>
+                            <connections>
+                                <action selector="toggleTimer:" target="gEe-Vl-JZj" id="j39-GT-nxX"/>
+                                <binding destination="gEe-Vl-JZj" name="enabled" keyPath="disabled" id="OEH-V7-NrJ"/>
+                            </connections>
+                        </button>
+                        <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="ux3-Yg-BF3">
+                            <rect key="frame" x="73" y="10" width="16" height="16"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="StopButton" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="RIk-xU-15c">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                            <connections>
+                                <action selector="toggleTimer:" target="gEe-Vl-JZj" id="k79-l8-zpy"/>
+                                <binding destination="gEe-Vl-JZj" name="enabled" keyPath="enabled" id="vId-wU-ElG"/>
+                            </connections>
+                        </button>
+                        <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="cHv-YY-fF8">
+                            <rect key="frame" x="127" y="10" width="16" height="16"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <buttonCell key="cell" type="square" bezelStyle="shadowlessSquare" image="RestartButton" imagePosition="only" alignment="center" imageScaling="proportionallyUpOrDown" inset="2" id="tOC-cZ-jP8">
+                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                            <connections>
+                                <action selector="resetTimer:" target="gEe-Vl-JZj" id="l01-5C-pO2"/>
+                                <binding destination="gEe-Vl-JZj" name="enabled" keyPath="enabled" id="2i9-R3-SA0"/>
+                            </connections>
+                        </button>
+                    </subviews>
+                </customView>
                 <customView id="Q3w-LZ-ipl" userLabel="Interval">
-                    <rect key="frame" x="0.0" y="0.0" width="163" height="24"/>
+                    <rect key="frame" x="0.0" y="0.0" width="163" height="25"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <subviews>
                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" allowsCharacterPickerTouchBarItem="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bHh-df-Se7" userLabel="Interval Label">
@@ -112,7 +166,7 @@
                             </textFieldCell>
                         </textField>
                         <stepper horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="mSB-18-3wR" userLabel="Interval Stepper">
-                            <rect key="frame" x="126" y="-2" width="19" height="27"/>
+                            <rect key="frame" x="127" y="-1" width="19" height="27"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                             <stepperCell key="cell" lineBreakMode="truncatingHead" continuous="YES" alignment="left" increment="5" minValue="5" maxValue="600" doubleValue="5" id="ghn-kl-ysh"/>
                             <connections>
@@ -121,9 +175,35 @@
                         </stepper>
                     </subviews>
                 </customView>
-                <userDefaultsController representsSharedInstance="YES" id="oey-xm-2ni"/>
+                <customView id="C4I-d5-Tb4" userLabel="Preferences">
+                    <rect key="frame" x="0.0" y="0.0" width="163" height="45"/>
+                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    <subviews>
+                        <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="E7w-0g-DDt">
+                            <rect key="frame" x="18" y="22" width="127" height="18"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <buttonCell key="cell" type="check" title="Save Interval" bezelStyle="regularSquare" imagePosition="right" inset="2" id="YJu-D2-JQz">
+                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                        </button>
+                        <button fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="5JE-tB-e0M">
+                            <rect key="frame" x="18" y="2" width="127" height="18"/>
+                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            <buttonCell key="cell" type="check" title="Sleep" bezelStyle="regularSquare" imagePosition="right" inset="2" id="dN8-8i-cOD">
+                                <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
+                                <font key="font" metaFont="system"/>
+                            </buttonCell>
+                        </button>
+                    </subviews>
+                </customView>
             </objects>
             <point key="canvasLocation" x="75" y="0.0"/>
         </scene>
     </scenes>
+    <resources>
+        <image name="PlayButton" width="32" height="32"/>
+        <image name="RestartButton" width="32" height="32"/>
+        <image name="StopButton" width="32" height="32"/>
+    </resources>
 </document>
diff --git a/SleepWell/MenubarController.swift b/SleepWell/MenubarController.swift
index 22df536..fa118d5 100644
--- a/SleepWell/MenubarController.swift
+++ b/SleepWell/MenubarController.swift
@@ -13,27 +13,35 @@ class MenubarController: NSObject {
     @IBOutlet weak var menubar: NSMenu!
     @IBOutlet weak var timerLabel: NSTextField!
     @IBOutlet weak var progressbar: NSProgressIndicator!
-    @IBOutlet weak var toggleButton: NSMenuItem!
     @IBOutlet weak var intervalLabel: NSTextField!
     @IBOutlet weak var intervalStepper: NSStepper!
+    @IBOutlet weak var startButton: NSButton!
+    @IBOutlet weak var stopButton: NSButton!
+    @IBOutlet weak var restartButton: NSButton!
     
     var interval = 0
-    var enabled = false
+    dynamic var enabled: NSNumber? = false
+    dynamic var disabled: NSNumber? = true
     var timeRemaining = 0
     var timer = Timer()
     let menubarIcon = NSStatusBar.system().statusItem(withLength: NSVariableStatusItemLength)
     
-    @IBAction func toggleTimer(_ sender: NSMenuItem) {
+    @IBAction func toggleTimer(_ sender: NSButton) {
         progressbar.doubleValue = Double(0)
         timeRemaining = interval
         
-        if enabled == false {
+        if isEnabled() == false {
             startTimer()
         } else {
             stopTimer()
         }
     }
     
+    @IBAction func resetTimer(_ sender: NSButton) {
+        progressbar.doubleValue = Double(0)
+        timeRemaining = interval
+    }
+    
     @IBAction func setTimeInterval(_ sender: NSStepper) {
         setTime(minutes: sender.integerValue)
     }
@@ -47,12 +55,32 @@ class MenubarController: NSObject {
         menubarIcon.menu = menubar
         
         setTime(minutes: 60)
+        setControlButtonStates()
+    }
+    
+    func isEnabled() -> Bool {
+        return (enabled?.boolValue)!
+    }
+    
+    func enable() {
+        enabled = NSNumber?.init(true)
+        disabled = NSNumber?.init(false)
+    }
+    
+    func disable() {
+        enabled = NSNumber?.init(false)
+        disabled = NSNumber?.init(true)
     }
     
     func getTime() -> Int {
         return interval / 60
     }
     
+    func setControlButtonStates() {
+        startButton.image?.isTemplate = true
+        stopButton.image?.isTemplate = true
+        restartButton.image?.isTemplate = true
+    }
     
     func setTime(minutes : Int) {
         interval = minutes * 60
@@ -63,8 +91,7 @@ class MenubarController: NSObject {
     }
     
     func startTimer() {
-        enabled = true
-        toggleButton.title = "Stop"
+        enable()
         
         DispatchQueue.main.async {
             self.timer = Timer(timeInterval: 1.0, target: self, selector: #selector(self.timerRunning), userInfo: nil, repeats: true)
@@ -73,9 +100,9 @@ class MenubarController: NSObject {
     }
     
     func stopTimer() {
+        disable()
+        
         timer.invalidate()
-        enabled = false
-        toggleButton.title = "Start"
         timerLabel.stringValue = ""
         progressbar.doubleValue = Double(0)
     }