diff --git a/Bento/Base.lproj/Main.storyboard b/Bento/Base.lproj/Main.storyboard
index 8a8e4acf..5f6b1e98 100755
--- a/Bento/Base.lproj/Main.storyboard
+++ b/Bento/Base.lproj/Main.storyboard
@@ -2440,10 +2440,10 @@
             </objects>
             <point key="canvasLocation" x="-637" y="2496"/>
         </scene>
-        <!--View Controller-->
+        <!--Out Of Delivery Address View Controller-->
         <scene sceneID="f8Y-xK-MvI">
             <objects>
-                <viewController id="wEm-w1-NG4" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="OutOfDelivery" id="wEm-w1-NG4" customClass="OutOfDeliveryAddressViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Y5P-ws-gUK">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
diff --git a/Bento/ViewController/MakeBento/CustomViewController.xib b/Bento/ViewController/MakeBento/CustomViewController.xib
index 92f8f151..456e02fe 100644
--- a/Bento/ViewController/MakeBento/CustomViewController.xib
+++ b/Bento/ViewController/MakeBento/CustomViewController.xib
@@ -65,7 +65,7 @@
                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="apD-DI-s6F" userLabel="mainDishImageView">
                                     <rect key="frame" x="0.0" y="0.0" width="166" height="199"/>
                                 </imageView>
-                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="lyX-oF-ZJD" userLabel="mainDishLabel">
+                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="lyX-oF-ZJD" userLabel="mainDishLabel">
                                     <rect key="frame" x="8" y="8" width="150" height="183"/>
                                     <fontDescription key="fontDescription" name="OpenSans-Bold" family="Open Sans" pointSize="13"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -113,7 +113,7 @@
                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="qWm-lu-0vF" userLabel="sideDish1ImageView">
                                     <rect key="frame" x="0.0" y="0.0" width="166" height="199"/>
                                 </imageView>
-                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="taL-Dl-E5e" userLabel="sideDish1Label">
+                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="taL-Dl-E5e" userLabel="sideDish1Label">
                                     <rect key="frame" x="8" y="8" width="150" height="183"/>
                                     <fontDescription key="fontDescription" name="OpenSans-Bold" family="Open Sans" pointSize="13"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -161,7 +161,7 @@
                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="RIr-24-nJ7" userLabel="sideDish2ImageView">
                                     <rect key="frame" x="0.0" y="0.0" width="166" height="200"/>
                                 </imageView>
-                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="9uk-LF-eKp" userLabel="sideDish2Label">
+                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="9uk-LF-eKp" userLabel="sideDish2Label">
                                     <rect key="frame" x="8" y="8" width="150" height="184"/>
                                     <fontDescription key="fontDescription" name="OpenSans-Bold" family="Open Sans" pointSize="13"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -209,7 +209,7 @@
                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="BcV-MQ-CI5" userLabel="sideDish3ImageView">
                                     <rect key="frame" x="0.0" y="0.0" width="166" height="200"/>
                                 </imageView>
-                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MAp-Tc-SIx" userLabel="sideDish3Label">
+                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="MAp-Tc-SIx" userLabel="sideDish3Label">
                                     <rect key="frame" x="8" y="8" width="150" height="184"/>
                                     <fontDescription key="fontDescription" name="OpenSans-Bold" family="Open Sans" pointSize="13"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/Bento/ViewController/MakeBento/FiveCustomViewController.xib b/Bento/ViewController/MakeBento/FiveCustomViewController.xib
index b05a10c9..9481d915 100644
--- a/Bento/ViewController/MakeBento/FiveCustomViewController.xib
+++ b/Bento/ViewController/MakeBento/FiveCustomViewController.xib
@@ -68,7 +68,7 @@
                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="xp7-p8-mRg" userLabel="mainDishImageView">
                                     <rect key="frame" x="0.0" y="0.0" width="333" height="140"/>
                                 </imageView>
-                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="uFZ-Zh-ksK" userLabel="mainDishLabel">
+                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="uFZ-Zh-ksK" userLabel="mainDishLabel">
                                     <rect key="frame" x="8" y="8" width="317" height="124"/>
                                     <fontDescription key="fontDescription" name="OpenSans-Bold" family="Open Sans" pointSize="13"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -116,7 +116,7 @@
                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="f1j-W7-fTL" userLabel="sideDish1ImageView">
                                     <rect key="frame" x="0.0" y="0.0" width="166" height="140"/>
                                 </imageView>
-                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yAU-rt-OKD" userLabel="sideDish1Label">
+                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="yAU-rt-OKD" userLabel="sideDish1Label">
                                     <rect key="frame" x="8" y="8" width="150" height="124"/>
                                     <fontDescription key="fontDescription" name="OpenSans-Bold" family="Open Sans" pointSize="13"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -164,7 +164,7 @@
                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="wfm-mK-400" userLabel="sideDish2ImageView">
                                     <rect key="frame" x="0.0" y="0.0" width="166" height="140"/>
                                 </imageView>
-                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FF1-M2-4dx" userLabel="sideDish2Label">
+                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="FF1-M2-4dx" userLabel="sideDish2Label">
                                     <rect key="frame" x="8" y="8" width="150" height="124"/>
                                     <fontDescription key="fontDescription" name="OpenSans-Bold" family="Open Sans" pointSize="13"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -212,7 +212,7 @@
                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="dD2-xm-kfR" userLabel="sideDish3ImageView">
                                     <rect key="frame" x="0.0" y="0.0" width="166" height="140"/>
                                 </imageView>
-                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="b8h-py-D4a" userLabel="sideDish3Label">
+                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="b8h-py-D4a" userLabel="sideDish3Label">
                                     <rect key="frame" x="8" y="8" width="150" height="124"/>
                                     <fontDescription key="fontDescription" name="OpenSans-Bold" family="Open Sans" pointSize="13"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@@ -260,7 +260,7 @@
                                 <imageView hidden="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="v1A-WG-o5o" userLabel="sideDish4ImageView">
                                     <rect key="frame" x="0.0" y="0.0" width="166" height="140"/>
                                 </imageView>
-                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="HnX-oT-vRZ" userLabel="sideDish4Label">
+                                <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="HnX-oT-vRZ" userLabel="sideDish4Label">
                                     <rect key="frame" x="8" y="8" width="150" height="124"/>
                                     <fontDescription key="fontDescription" name="OpenSans-Bold" family="Open Sans" pointSize="13"/>
                                     <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
diff --git a/Bento/ViewController/MakeBento/FiveHomeViewController.m b/Bento/ViewController/MakeBento/FiveHomeViewController.m
index 9ba541fc..b866234f 100644
--- a/Bento/ViewController/MakeBento/FiveHomeViewController.m
+++ b/Bento/ViewController/MakeBento/FiveHomeViewController.m
@@ -932,7 +932,7 @@ - (void)updateUI {
         [self setUpPickerData];
         [self updateWidget];
         
-        [[NSUserDefaults standardUserDefaults] rm_setCustomObject:[NSString stringWithFormat:@"%ld", self.orderMode] forKey:@"savedOrderMode0Or1"];
+//        [[NSUserDefaults standardUserDefaults] rm_setCustomObject:[NSString stringWithFormat:@"%ld", self.orderMode] forKey:@"savedOrderMode0Or1"];
     });
 }
 
diff --git a/Bento/ViewController/MakeBento/FiveHomeViewController.xib b/Bento/ViewController/MakeBento/FiveHomeViewController.xib
index aae878a1..654a3100 100644
--- a/Bento/ViewController/MakeBento/FiveHomeViewController.xib
+++ b/Bento/ViewController/MakeBento/FiveHomeViewController.xib
@@ -156,7 +156,7 @@
                                     <color key="textColor" red="0.4039215686" green="0.44705882349999998" blue="0.50196078430000002" alpha="1" colorSpace="calibratedRGB"/>
                                     <nil key="highlightedColor"/>
                                 </label>
-                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="description" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jBo-MK-SWJ">
+                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="description" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" preferredMaxLayoutWidth="0.0" translatesAutoresizingMaskIntoConstraints="NO" id="jBo-MK-SWJ">
                                     <rect key="frame" x="20" y="34" width="335" height="17"/>
                                     <fontDescription key="fontDescription" name="OpenSans-Semibold" family="Open Sans" pointSize="10"/>
                                     <color key="textColor" red="0.4039215686" green="0.44705882349999998" blue="0.50196078430000002" alpha="1" colorSpace="calibratedRGB"/>
diff --git a/Pods/Pods.xcodeproj/xcuserdata/JosephLauSF.xcuserdatad/xcschemes/xcschememanagement.plist b/Pods/Pods.xcodeproj/xcuserdata/JosephLauSF.xcuserdatad/xcschemes/xcschememanagement.plist
index b74297d7..8ffdb331 100644
--- a/Pods/Pods.xcodeproj/xcuserdata/JosephLauSF.xcuserdatad/xcschemes/xcschememanagement.plist
+++ b/Pods/Pods.xcodeproj/xcuserdata/JosephLauSF.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -82,6 +82,16 @@
 	</dict>
 	<key>SuppressBuildableAutocreation</key>
 	<dict>
+		<key>07AE85EF976CC1D2D2925B89F1B48C39</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>113DBC1D020C68312E472090EC17D5ED</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>1F3272C744E54D58B55D54C0A24897C8</key>
 		<dict>
 			<key>primary</key>
@@ -102,11 +112,26 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>3DFAFC899A9AC24853EEE7E961236CA5</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>4C119F7506B8A67E6D6DE5105B631BF3</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>4C86CDCFBDD7B951618F544A8E2CC0D2</key>
 		<dict>
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>4FAF6BABBA54229C883F2723F91BE6DC</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>519D3C01AB6F4FDFA8E4CD257350EE8C</key>
 		<dict>
 			<key>primary</key>
@@ -117,6 +142,11 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>65585F0885D975E327A44FD4C449BA99</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>7815AAE309AA7E56AD33131B20AD112C</key>
 		<dict>
 			<key>primary</key>
@@ -147,6 +177,16 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>CC3FADE9EC7E03137FA26E90F81B576D</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>D50244253CF9D1986B6A9F303EAB85AF</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 		<key>EC511E28905FE2C20E23DA0E564D2673</key>
 		<dict>
 			<key>primary</key>
@@ -157,6 +197,11 @@
 			<key>primary</key>
 			<true/>
 		</dict>
+		<key>F95FFC251A77BB0DA41E4AEA1F767CC0</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
 	</dict>
 </dict>
 </plist>