diff --git a/HeroApp/HeroApp/ASMapKit/JPSThumbnailAnnotationView.m b/HeroApp/HeroApp/ASMapKit/JPSThumbnailAnnotationView.m
index 543c8cc..416ef71 100644
--- a/HeroApp/HeroApp/ASMapKit/JPSThumbnailAnnotationView.m
+++ b/HeroApp/HeroApp/ASMapKit/JPSThumbnailAnnotationView.m
@@ -57,7 +57,7 @@ - (void)setupView {
     [self setupImageView];
     [self setupTitleLabel];
     [self setupSubtitleLabel];
-    [self setupDisclosureButton];
+  //[self setupDisclosureButton];
     [self setLayerProperties];
     [self setDetailGroupAlpha:0.0f];
 }
@@ -72,7 +72,7 @@ - (void)setupImageView {
 }
 
 - (void)setupTitleLabel {
-    _titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(-32.0f, 16.0f, 168.0f, 20.0f)];
+    _titleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0.0f, 16.0f, 130.0f, 20.0f)];
     _titleLabel.textColor = [UIColor darkTextColor];
     _titleLabel.font = [UIFont boldSystemFontOfSize:17];
     _titleLabel.minimumScaleFactor = 0.8f;
@@ -81,9 +81,10 @@ - (void)setupTitleLabel {
 }
 
 - (void)setupSubtitleLabel {
-    _subtitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(-32.0f, 36.0f, 168.0f, 20.0f)];
+    _subtitleLabel = [[UILabel alloc] initWithFrame:CGRectMake(0.0f, 36.0f, 100.0f, 20.0f)];
     _subtitleLabel.textColor = [UIColor grayColor];
     _subtitleLabel.font = [UIFont systemFontOfSize:12.0f];
+    _subtitleLabel.text = @"Last Location";
     [self addSubview:_subtitleLabel];
 }
 
@@ -222,7 +223,7 @@ - (void)animateBubbleWithDirection:(JPSThumbnailAnnotationViewAnimationDirection
     BOOL growing = (animationDirection == JPSThumbnailAnnotationViewAnimationDirectionGrow);
     // Image
     [UIView animateWithDuration:kJPSThumbnailAnnotationViewAnimationDuration animations:^{
-        CGFloat xOffset = (growing ? -1 : 1) * kJPSThumbnailAnnotationViewExpandOffset/2.0f;
+        CGFloat xOffset = (growing ? -1 : 1) * kJPSThumbnailAnnotationViewExpandOffset/3.0f;
         self.imageView.frame = CGRectOffset(self.imageView.frame, xOffset, 0.0f);
     } completion:^(BOOL finished) {
         if (animationDirection == JPSThumbnailAnnotationViewAnimationDirectionShrink) {
@@ -240,7 +241,7 @@ - (void)animateBubbleWithDirection:(JPSThumbnailAnnotationViewAnimationDirection
     animation.duration = kJPSThumbnailAnnotationViewAnimationDuration;
     
     // Stroke & Shadow From/To Values
-    CGRect largeRect = CGRectInset(self.bounds, -kJPSThumbnailAnnotationViewExpandOffset/2.0f, 0.0f);
+    CGRect largeRect = CGRectInset(self.bounds, -kJPSThumbnailAnnotationViewExpandOffset/3.0f, 0.0f);
     
     CGPathRef fromPath = [self newBubbleWithRect:growing ? self.bounds : largeRect];
     animation.fromValue = (__bridge id)fromPath;
diff --git a/HeroApp/HeroApp/AppDelegate.m b/HeroApp/HeroApp/AppDelegate.m
index e870046..06f91df 100644
--- a/HeroApp/HeroApp/AppDelegate.m
+++ b/HeroApp/HeroApp/AppDelegate.m
@@ -7,6 +7,8 @@
 //
 
 #import "AppDelegate.h"
+#import <UIKit/UIUserNotificationSettings.h>
+#import "ServerManager.h"
 
 @interface AppDelegate ()
 
@@ -47,23 +49,28 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
     if(!ReadValue(SOUND_FIND_PHONE_THUR_HIRO)){
         StoreValue(SOUND_FIND_PHONE_THUR_HIRO,@"HiroTone1");
     }
-
+    ////////////////////////////
+    NSArray *centralManagerIdentifiers =
+    launchOptions[UIApplicationLaunchOptionsBluetoothCentralsKey];
+    ////////////////////////////
     [self registerForRemoteNotification];
     return YES;
 }
 
+
 - (void)registerForRemoteNotification{
-    if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0)
-    {
-        [[UIApplication sharedApplication] registerUserNotificationSettings:[UIUserNotificationSettings settingsForTypes:(UIUserNotificationTypeSound | UIUserNotificationTypeAlert | UIUserNotificationTypeBadge) categories:nil]];
-        [[UIApplication sharedApplication] registerForRemoteNotifications];
-    }
-    else
-    {
-        [[UIApplication sharedApplication] registerForRemoteNotificationTypes:
-         (UIUserNotificationTypeBadge | UIUserNotificationTypeSound | UIUserNotificationTypeAlert)];
-    }
     
+//    if ([[[UIDevice currentDevice] systemVersion] floatValue] >= 8.0)
+//    {
+//        [[UIApplication sharedApplication] registerUserNotificationSettings:[UIUserNotificationSettings settingsForTypes:(UIUserNotificationTypeSound | UIUserNotificationTypeAlert | UIUserNotificationTypeBadge) categories:nil]];
+//        [[UIApplication sharedApplication] registerForRemoteNotifications];
+//    }
+//    else
+//    {
+//        [[UIApplication sharedApplication] registerForRemoteNotificationTypes:
+//         (UIUserNotificationTypeBadge | UIUserNotificationTypeSound | UIUserNotificationTypeAlert)];
+//    }
+
 }
 
 - (void)peripheralFound:(NSNotification *)note{
@@ -155,8 +162,19 @@ - (void)applicationWillTerminate:(UIApplication *)application {
     
 }
 
+
+- (void)application:(UIApplication *)application handleActionWithIdentifier:(NSString *)identifier forLocalNotification:(UILocalNotification *)notification completionHandler:(void(^)())completionHandler {
+    NSLog(@"-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+--+-+-+-+-+");
+    [[ServerManager sharedInstance]stopPlayingAlarmSound];
+    
+    
+    if(completionHandler != nil)    //Finally call completion handler if its not nil
+        completionHandler();
+}
+
 - (void)application:(UIApplication *)application didReceiveLocalNotification:(UILocalNotification *)notification
 {
+    
     if(notification.userInfo[@"shouldShowInApp"] && [notification.userInfo[@"shouldShowInApp"]boolValue]){
         static UIAlertView *view;
         
@@ -172,6 +190,7 @@ - (void)application:(UIApplication *)application didReceiveLocalNotification:(UI
     
 }
 
+
 - (void)deviceDidUpdateProperty:(NSNotification *)note{
     HeroActor *actor = note.object;
     NSString *propertyName = note.userInfo[@"name"];
diff --git a/HeroApp/HeroApp/Base.lproj/Main.storyboard b/HeroApp/HeroApp/Base.lproj/Main.storyboard
index d47f513..3500783 100644
--- a/HeroApp/HeroApp/Base.lproj/Main.storyboard
+++ b/HeroApp/HeroApp/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7702" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="SDs-A5-0Qy">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="SDs-A5-0Qy">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7701"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
         <capability name="Constraints to layout margins" minToolsVersion="6.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -49,7 +49,7 @@
         </mutableArray>
     </customFonts>
     <scenes>
-        <!--Setting View Controller-->
+        <!--Settings-->
         <scene sceneID="nDQ-Wc-8XC">
             <objects>
                 <viewController id="lgp-d9-f1M" customClass="SettingViewController" sceneMemberID="viewController">
@@ -119,7 +119,7 @@
                                                     <constraint firstAttribute="width" constant="205" id="aBt-YC-7C7"/>
                                                 </constraints>
                                                 <fontDescription key="fontDescription" name="OpenSans-Light" family="Open Sans" pointSize="18"/>
-                                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Phone sound alert" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qSz-gG-fNc">
@@ -128,7 +128,7 @@
                                                     <constraint firstAttribute="height" constant="21" id="u24-NW-eak"/>
                                                 </constraints>
                                                 <fontDescription key="fontDescription" name="OpenSans-Light" family="Open Sans" pointSize="18"/>
-                                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Low battery notification" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0Jf-NX-czl">
@@ -146,7 +146,7 @@
                                                     <constraint firstAttribute="height" constant="21" id="5Eo-Uy-XgS"/>
                                                 </constraints>
                                                 <fontDescription key="fontDescription" name="OpenSans-Light" family="Open Sans" pointSize="18"/>
-                                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Hiro beep alert" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="pMo-Ch-3cI">
@@ -155,7 +155,7 @@
                                                     <constraint firstAttribute="height" constant="21" id="xJB-ND-fCI"/>
                                                 </constraints>
                                                 <fontDescription key="fontDescription" name="OpenSans-Light" family="Open Sans" pointSize="18"/>
-                                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="&quot;Find phone thru Hiro&quot; feature" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8Q0-yF-NJw">
@@ -165,7 +165,7 @@
                                                     <constraint firstAttribute="width" constant="267" id="DB1-dF-9DX"/>
                                                 </constraints>
                                                 <fontDescription key="fontDescription" name="OpenSans-Light" family="Open Sans" pointSize="18"/>
-                                                <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="H4I-IH-rwa">
@@ -323,7 +323,9 @@
                         </constraints>
                     </view>
                     <toolbarItems/>
-                    <navigationItem key="navigationItem" id="Qws-1B-aDZ"/>
+                    <navigationItem key="navigationItem" title="Settings" id="Qws-1B-aDZ">
+                        <barButtonItem key="backBarButtonItem" title=" " id="QPY-OF-Ums"/>
+                    </navigationItem>
                     <connections>
                         <outlet property="btnBeepAlert" destination="q27-Cf-wtK" id="Y5e-mQ-a1L"/>
                         <outlet property="btnDelete" destination="D6h-xE-FJ5" id="07l-i4-ykb"/>
@@ -351,7 +353,7 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="Cas-5Z-39J">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                        <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="calibratedRGB"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" accessoryType="checkmark" indentationWidth="10" reuseIdentifier="ringtonecell" id="uAC-m3-01k">
                                 <autoresizingMask key="autoresizingMask"/>
@@ -576,7 +578,9 @@
                             <constraint firstItem="llU-RE-OiV" firstAttribute="top" secondItem="VUY-Vx-XyP" secondAttribute="bottom" constant="9" id="uhS-09-rHe"/>
                         </constraints>
                     </view>
-                    <navigationItem key="navigationItem" id="Epv-Rl-pnz"/>
+                    <navigationItem key="navigationItem" id="Epv-Rl-pnz">
+                        <barButtonItem key="backBarButtonItem" title=" " id="TOi-qm-OJp"/>
+                    </navigationItem>
                     <connections>
                         <outlet property="innerView" destination="Y34-Xk-lxO" id="fHy-9C-J3c"/>
                         <outlet property="scrollView" destination="llU-RE-OiV" id="8XC-8a-3uq"/>
@@ -593,7 +597,7 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" id="KEw-Hn-VUf">
                         <rect key="frame" x="0.0" y="0.0" width="320" height="504"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
+                        <color key="backgroundColor" red="0.93725490196078431" green="0.93725490196078431" blue="0.95686274509803926" alpha="1" colorSpace="calibratedRGB"/>
                         <prototypes>
                             <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" reuseIdentifier="scanCell" textLabel="SSN-t3-Ght" detailTextLabel="MCC-HW-8nI" style="IBUITableViewCellStyleValue1" id="WdD-jt-3zA">
                                 <autoresizingMask key="autoresizingMask"/>
@@ -603,7 +607,7 @@
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="My Hiro" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SSN-t3-Ght">
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" name="OpenSans-Light" family="Open Sans" pointSize="16"/>
-                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Subtitle" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="MCC-HW-8nI">
@@ -697,13 +701,13 @@
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Current Connected Wi-Fi" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="99C-RJ-Zym">
                                         <rect key="frame" x="26" y="19" width="231.5" height="29"/>
                                         <fontDescription key="fontDescription" name="OpenSans-Light" family="Open Sans" pointSize="21"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Selected Safe Zones" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KPu-RU-BUn">
                                         <rect key="frame" x="26" y="117" width="190" height="29"/>
                                         <fontDescription key="fontDescription" name="OpenSans-Light" family="Open Sans" pointSize="21"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Paul's Internet" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="58a-6q-vc9">
@@ -712,7 +716,7 @@
                                             <constraint firstAttribute="width" constant="170" id="B8e-Ct-idm"/>
                                         </constraints>
                                         <fontDescription key="fontDescription" name="OpenSansLight-Italic" family="Open Sans" pointSize="19"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ygs-6s-hCG">
@@ -746,7 +750,7 @@
                                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="House Network" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="cTT-kD-bGy">
                                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                             <fontDescription key="fontDescription" name="OpenSansLight-Italic" family="Open Sans" pointSize="19"/>
-                                                            <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                                            <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                     </subviews>
@@ -761,7 +765,7 @@
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Swipe on network to remove it" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TzW-eX-F57">
                                         <rect key="frame" x="26" y="149" width="163.5" height="16.5"/>
                                         <fontDescription key="fontDescription" name="OpenSans-Light" family="Open Sans" pointSize="12"/>
-                                        <color key="textColor" cocoaTouchSystemColor="darkTextColor"/>
+                                        <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                         <nil key="highlightedColor"/>
                                     </label>
                                 </subviews>
@@ -798,6 +802,7 @@
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Wi-Fi Safe Zones" id="AIp-24-RtI">
+                        <barButtonItem key="backBarButtonItem" title=" " id="EHc-Kc-pQh"/>
                         <barButtonItem key="rightBarButtonItem" image="InfoButton_A" id="GMa-hc-Ld0">
                             <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                             <connections>
@@ -839,10 +844,10 @@
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9mz-IC-sai" id="rWq-Sk-Xe3">
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="78A-hU-YDU">
+                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="78A-hU-YDU">
                                                     <rect key="frame" x="15" y="15" width="290" height="100"/>
                                                     <subviews>
-                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="base" translatesAutoresizingMaskIntoConstraints="NO" id="QGd-cy-1Sb">
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="base" translatesAutoresizingMaskIntoConstraints="NO" id="QGd-cy-1Sb">
                                                             <rect key="frame" x="0.0" y="0.0" width="290" height="100"/>
                                                         </imageView>
                                                         <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PzL-ji-mIK" userLabel="PhotoView">
@@ -865,42 +870,42 @@
                                                                 <constraint firstAttribute="bottom" secondItem="xBP-sv-HY4" secondAttribute="bottom" id="hjz-9Z-Dhb"/>
                                                             </constraints>
                                                         </view>
-                                                        <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="uPg-Iu-1TY">
+                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uPg-Iu-1TY">
                                                             <rect key="frame" x="97" y="54" width="190" height="1"/>
                                                             <color key="backgroundColor" red="0.83529411764705885" green="0.83529411764705885" blue="0.83529411764705885" alpha="1" colorSpace="calibratedRGB"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="1" id="L3d-h6-hp0"/>
                                                             </constraints>
                                                         </view>
-                                                        <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="LkM-4r-POJ">
+                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="LkM-4r-POJ">
                                                             <rect key="frame" x="244" y="54" width="1" height="40"/>
                                                             <color key="backgroundColor" red="0.83529411760000005" green="0.83529411760000005" blue="0.83529411760000005" alpha="1" colorSpace="calibratedRGB"/>
                                                         </view>
-                                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalHuggingPriority="251" misplaced="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="My Hiro" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="daE-N7-lno">
+                                                        <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" verticalHuggingPriority="251" contentHorizontalAlignment="left" contentVerticalAlignment="center" text="My Hiro" minimumFontSize="10" translatesAutoresizingMaskIntoConstraints="NO" id="daE-N7-lno">
                                                             <rect key="frame" x="101" y="8" width="145" height="38"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="width" constant="145" id="4SL-9q-5py"/>
                                                             </constraints>
                                                             <fontDescription key="fontDescription" name="OpenSans-Light" family="Open Sans" pointSize="23"/>
-                                                            <textInputTraits key="textInputTraits"/>
+                                                            <textInputTraits key="textInputTraits" autocapitalizationType="words"/>
                                                             <connections>
                                                                 <outlet property="delegate" destination="2uM-yd-mcj" id="1k2-jJ-7P0"/>
                                                             </connections>
                                                         </textField>
-                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" misplaced="YES" image="Battery_N4" translatesAutoresizingMaskIntoConstraints="NO" id="x2p-P3-8qw">
+                                                        <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Battery_N4" translatesAutoresizingMaskIntoConstraints="NO" id="x2p-P3-8qw">
                                                             <rect key="frame" x="253" y="20" width="26" height="26"/>
                                                             <constraints>
                                                                 <constraint firstAttribute="height" constant="26" id="Phg-AE-6T7"/>
                                                                 <constraint firstAttribute="width" constant="26" id="u8g-Xw-xOA"/>
                                                             </constraints>
                                                         </imageView>
-                                                        <button opaque="NO" contentMode="scaleToFill" misplaced="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1j7-Z5-tqt">
+                                                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="1j7-Z5-tqt">
                                                             <rect key="frame" x="249" y="60" width="35" height="35"/>
                                                             <state key="normal" image="Settings_N">
                                                                 <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
                                                             </state>
                                                         </button>
-                                                        <view contentMode="scaleToFill" misplaced="YES" translatesAutoresizingMaskIntoConstraints="NO" id="lIu-qC-S68">
+                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lIu-qC-S68">
                                                             <rect key="frame" x="96" y="57" width="145" height="41"/>
                                                             <subviews>
                                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="3BI-9U-OnN">
@@ -1025,6 +1030,7 @@
                         </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="My Hiros" id="X8i-7d-AIk">
+                        <barButtonItem key="backBarButtonItem" title=" " id="91H-5t-zso"/>
                         <barButtonItem key="leftBarButtonItem" image="wifi" id="2VM-pE-awu">
                             <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
                             <connections>
@@ -1111,7 +1117,7 @@
                                 <rect key="frame" x="10" y="73" width="300" height="487"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mLc-Zk-0Sq">
-                                        <rect key="frame" x="0.0" y="0.0" width="300" height="700"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="300" height="484"/>
                                         <subviews>
                                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Wi-Fi Safe Zone Feature" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3VP-v4-orL">
                                                 <rect key="frame" x="17" y="18" width="280" height="21"/>
@@ -1122,21 +1128,22 @@
                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="7" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5FC-xt-CQa">
-                                                <rect key="frame" x="27" y="47" width="256" height="151"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5FC-xt-CQa">
+                                                <rect key="frame" x="27" y="47" width="256" height="226"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="151" id="rTS-Wj-erK"/>
+                                                    <constraint firstAttribute="height" constant="226" id="rTS-Wj-erK"/>
                                                 </constraints>
-                                                <string key="text">Select the Wi-Fi Networks where you do not need disconnect notifications. This feature prevents your Hiro and Phone from buzzing when, for example, you leave your phone in a room that is over 200ft away from another room.</string>
+                                                <string key="text">Select the Wi-Fi network in which you do not wish to receive disconnect notifications. This feature prevents your Hiro from buzzing and your phone from ringing when they go beyond the Bluetooth connection range. An example would be if you are constantly getting away from your Hiro in your home (from bedroom to garage), but do not want to get disconnect notifications.</string>
                                                 <fontDescription key="fontDescription" name="OpenSans-Light" family="Open Sans" pointSize="15"/>
                                                 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Note that you will still be able to buzz your Hiro at any time as long as you are in the 200 feet range." lineBreakMode="tailTruncation" numberOfLines="4" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c3O-Yi-Fj0">
-                                                <rect key="frame" x="27" y="206" width="256" height="76"/>
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c3O-Yi-Fj0">
+                                                <rect key="frame" x="27" y="288" width="256" height="123"/>
                                                 <constraints>
-                                                    <constraint firstAttribute="height" constant="76" id="VQZ-69-HNL"/>
+                                                    <constraint firstAttribute="height" constant="123" id="VQZ-69-HNL"/>
                                                 </constraints>
+                                                <string key="text">Note that you will still be able to buzz your Hiro at any time as long as they are both in range. If they are not in range, you will be able to see its last disconnection location from the pin dropped on the map.</string>
                                                 <fontDescription key="fontDescription" name="OpenSans-Light" family="Open Sans" pointSize="15"/>
                                                 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                 <nil key="highlightedColor"/>
@@ -1146,11 +1153,11 @@
                                         <constraints>
                                             <constraint firstItem="3VP-v4-orL" firstAttribute="leading" secondItem="mLc-Zk-0Sq" secondAttribute="leading" constant="17" id="1Ao-CW-477"/>
                                             <constraint firstItem="5FC-xt-CQa" firstAttribute="leading" secondItem="mLc-Zk-0Sq" secondAttribute="leading" constant="27" id="1EI-Tr-G6M"/>
-                                            <constraint firstAttribute="height" constant="700" id="BAS-w8-vob"/>
+                                            <constraint firstAttribute="height" constant="484" id="BAS-w8-vob"/>
                                             <constraint firstItem="5FC-xt-CQa" firstAttribute="top" secondItem="mLc-Zk-0Sq" secondAttribute="top" constant="47" id="KRh-tu-7cR"/>
                                             <constraint firstItem="5FC-xt-CQa" firstAttribute="centerX" secondItem="mLc-Zk-0Sq" secondAttribute="centerX" constant="5" id="Mcm-t0-JdF"/>
                                             <constraint firstItem="3VP-v4-orL" firstAttribute="top" secondItem="mLc-Zk-0Sq" secondAttribute="top" constant="18" id="Mzg-Ay-S3d"/>
-                                            <constraint firstItem="c3O-Yi-Fj0" firstAttribute="top" secondItem="5FC-xt-CQa" secondAttribute="bottom" constant="8" id="NEu-Nh-vhv"/>
+                                            <constraint firstItem="c3O-Yi-Fj0" firstAttribute="top" secondItem="5FC-xt-CQa" secondAttribute="bottom" constant="15" id="NEu-Nh-vhv"/>
                                             <constraint firstAttribute="trailing" secondItem="3VP-v4-orL" secondAttribute="trailing" constant="3" id="TOE-J4-fsl"/>
                                             <constraint firstItem="c3O-Yi-Fj0" firstAttribute="trailing" secondItem="5FC-xt-CQa" secondAttribute="trailing" id="fxb-nL-2TS"/>
                                             <constraint firstItem="c3O-Yi-Fj0" firstAttribute="leading" secondItem="5FC-xt-CQa" secondAttribute="leading" id="ocC-xC-nYH"/>
@@ -1163,7 +1170,7 @@
                                     <constraint firstAttribute="trailing" secondItem="mLc-Zk-0Sq" secondAttribute="trailing" id="Rgz-RR-gHD"/>
                                     <constraint firstItem="mLc-Zk-0Sq" firstAttribute="leading" secondItem="mXz-Wx-dPO" secondAttribute="leading" id="aRf-Zo-1J3"/>
                                     <constraint firstItem="mLc-Zk-0Sq" firstAttribute="top" secondItem="mXz-Wx-dPO" secondAttribute="top" id="x5I-ch-W13"/>
-                                    <constraint firstAttribute="bottom" secondItem="mLc-Zk-0Sq" secondAttribute="bottom" id="yeA-vb-lbj"/>
+                                    <constraint firstAttribute="bottom" secondItem="mLc-Zk-0Sq" secondAttribute="bottom" constant="3" id="yeA-vb-lbj"/>
                                 </constraints>
                                 <connections>
                                     <outlet property="delegate" destination="T1E-8j-gpv" id="kYY-ad-jtY"/>
diff --git a/HeroApp/HeroApp/BleActor/HeroActor.m b/HeroApp/HeroApp/BleActor/HeroActor.m
index 557fc0e..ac60e3f 100644
--- a/HeroApp/HeroApp/BleActor/HeroActor.m
+++ b/HeroApp/HeroApp/BleActor/HeroActor.m
@@ -217,13 +217,22 @@ @implementation CentralManagerActor
 - (id)initWithServiceUUIDs:(NSArray *)aServiceUUIDs {
 	if (self = [super init]) {
         self.serviceUUIDs = aServiceUUIDs;
-		self.centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil];
+        ///////////////////////////////////////////
+        self.centralManager = [[CBCentralManager alloc] initWithDelegate:self queue:nil options:@{ CBCentralManagerOptionRestoreIdentifierKey:@"myCentralManagerIdentifier" }];
+        ///////////////////////////////////////////
         self.peripherals = [NSMutableArray array];
         self.peripheralList = [NSMutableArray array];
     }
     return self;
 }
 
+//////////////////////////////////////////////////
+- (void)centralManager:(CBCentralManager *)central willRestoreState:(NSDictionary *)state {
+    
+    NSArray *peripherals =  state[CBCentralManagerRestoredStatePeripheralsKey];
+}
+//////////////////////////////////////////////////
+
 - (void)retrievePeripherals {
     DLog(@"scanning for peripherals with service UUIDs %@", self.serviceUUIDs);
     
diff --git a/HeroApp/HeroApp/BleActor/ServerManager.m b/HeroApp/HeroApp/BleActor/ServerManager.m
index 21c50cf..b068dee 100644
--- a/HeroApp/HeroApp/BleActor/ServerManager.m
+++ b/HeroApp/HeroApp/BleActor/ServerManager.m
@@ -8,6 +8,8 @@
 
 #import "ServerManager.h"
 #import <MediaPlayer/MediaPlayer.h>
+#import <CoreTelephony/CTCallCenter.h>
+#import <CoreTelephony/CTCall.h>
 
 @implementation ServerManager
 {
@@ -176,12 +178,26 @@ - (void) peripheralManager:(CBPeripheralManager *)peripheral didAddService:(CBSe
     NSLog(@"Did add peripheral service, with error %@.", error);
 }
 
+-(bool)isOnPhoneCall {
+    
+    //Returns TRUE/YES if the user is currently on a phone call
+    CTCallCenter *callCenter = [[CTCallCenter alloc] init];
+    for (CTCall *call in callCenter.currentCalls)  {
+        if (call.callState == CTCallStateConnected) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
 - (void) peripheralManager:(CBPeripheralManager *)peripheral didReceiveWriteRequests:(NSArray *)requests
 {
-    static UILocalNotification *alarm;
-    if (alarm != nil)
+//    static UILocalNotification *alarm;
+    static UILocalNotification *remoteNotification;
+    if (remoteNotification != nil)
+
     {
-        [[UIApplication sharedApplication] cancelLocalNotification:alarm];
+        [[UIApplication sharedApplication] cancelLocalNotification:remoteNotification];
     }
     
     NSLog(@"Someone wrote to a characteristic");
@@ -192,17 +208,45 @@ - (void) peripheralManager:(CBPeripheralManager *)peripheral didReceiveWriteRequ
             NSUInteger alertValue = *(NSUInteger*) [[request value] bytes];
 //            NSUInteger requestOffset = request.offset;
 
-            if (alertValue > 0)
+            if (alertValue > 0 && ![self isOnPhoneCall])
             {
+                
                 [self startPlayingAlarmSound];
-
-//                self.playTimer = [NSTimer scheduledTimerWithTimeInterval:5.0 target:self selector:@selector(stopPlayingAlarmSound) userInfo:nil repeats:NO];
-                alarm = [[UILocalNotification alloc] init];
-                alarm.alertBody = [NSString stringWithFormat:@"Hiro wants to find your phone."];
-                alarm.alertAction = @"OK";
                 
+                UIMutableUserNotificationAction *notificationAction1 = [[UIMutableUserNotificationAction alloc] init];
+                notificationAction1.identifier = @"Dismiss";
+                notificationAction1.title = @"Dismiss";
+                notificationAction1.activationMode = UIUserNotificationActivationModeBackground;
+                notificationAction1.destructive = NO;
+                notificationAction1.authenticationRequired = NO;
                 
-                [[UIApplication sharedApplication] presentLocalNotificationNow:alarm];
+                UIMutableUserNotificationCategory *notificationCategory = [[UIMutableUserNotificationCategory alloc] init];
+                notificationCategory.identifier = @"Stop";
+                [notificationCategory setActions:@[notificationAction1] forContext:UIUserNotificationActionContextDefault];
+                [notificationCategory setActions:@[notificationAction1] forContext:UIUserNotificationActionContextMinimal];
+                
+                NSSet *categories = [NSSet setWithObjects:notificationCategory, nil];
+                
+                UIUserNotificationType notificationType = UIUserNotificationTypeBadge | UIUserNotificationTypeSound | UIUserNotificationTypeAlert;
+                UIUserNotificationSettings *notificationSettings = [UIUserNotificationSettings settingsForTypes:notificationType categories:categories];
+                
+                [[UIApplication sharedApplication] registerUserNotificationSettings:notificationSettings];
+                
+                remoteNotification = [[UILocalNotification alloc] init];
+//              remoteNotification.fireDate = [NSDate dateWithTimeIntervalSinceNow:10];
+                remoteNotification.alertBody = @"Hiro wants to find your phone.";
+                remoteNotification.category = @"Stop"; //  Same as category identifier
+                [[UIApplication sharedApplication] scheduleLocalNotification:remoteNotification];
+                
+                
+
+//                self.playTimer = [NSTimer scheduledTimerWithTimeInterval:5.0 target:self selector:@selector(stopPlayingAlarmSound) userInfo:nil repeats:NO];
+//                alarm = [[UILocalNotification alloc] init];
+//                alarm.alertBody = [NSString stringWithFormat:@"Hiro wants to find your phone."];
+//                alarm.alertAction = @"View";
+//
+//                
+//                [[UIApplication sharedApplication] presentLocalNotificationNow:alarm];
             }
             else
             {
diff --git a/HeroApp/HeroApp/Common/AppUtils.m b/HeroApp/HeroApp/Common/AppUtils.m
index 929f612..a7cefd2 100644
--- a/HeroApp/HeroApp/Common/AppUtils.m
+++ b/HeroApp/HeroApp/Common/AppUtils.m
@@ -499,7 +499,7 @@ void SendLocalNotificationForActor(HeroActor *deviceActor, BOOL isConnect)
         [[UIApplication sharedApplication] cancelLocalNotification: deviceActor.notification];
     }
     
-     deviceActor.notification = [[UILocalNotification alloc]init];
+    deviceActor.notification = [[UILocalNotification alloc]init];
     
     
     // Current date
@@ -511,10 +511,11 @@ void SendLocalNotificationForActor(HeroActor *deviceActor, BOOL isConnect)
     // Set the fire date/time
     [deviceActor.notification setFireDate:dateToFire];
     [deviceActor.notification setTimeZone:[NSTimeZone defaultTimeZone]];
+ 
     
     if(isConnect)
         DLog(@"Device is connected");
-        //[deviceActor.notification setAlertBody:[NSString stringWithFormat:@"%@ is connected!",deviceActor.state[kDeviceName]]];
+    //[deviceActor.notification setAlertBody:[NSString stringWithFormat:@"%@ is connected!",deviceActor.state[kDeviceName]]];
     else{
         [deviceActor.notification setAlertBody:[NSString stringWithFormat:@"%@ is getting away!",deviceActor.state[kDeviceName]]];
     }
diff --git a/HeroApp/HeroApp/Controls/CellTableViewCell.h b/HeroApp/HeroApp/Controls/CellTableViewCell.h
index 47eb8eb..48c66cd 100644
--- a/HeroApp/HeroApp/Controls/CellTableViewCell.h
+++ b/HeroApp/HeroApp/Controls/CellTableViewCell.h
@@ -27,6 +27,6 @@
 - (IBAction)actionPlaySound:(id)sender;
 @end
 
-@interface CellTableViewCell : UITableViewCell
+@interface CellTableViewCell : UITableViewCell <UITextFieldDelegate>
 
 @end
diff --git a/HeroApp/HeroApp/Controls/CellTableViewCell.m b/HeroApp/HeroApp/Controls/CellTableViewCell.m
index f759e1b..f38d641 100644
--- a/HeroApp/HeroApp/Controls/CellTableViewCell.m
+++ b/HeroApp/HeroApp/Controls/CellTableViewCell.m
@@ -112,11 +112,12 @@ - (void)refreshView{
         [self.imgViewBattery setImage:[UIImage imageNamed:batteryImage]];
         
         [self.btnNearBy setImage:[UIImage imageNamed:rssiImage] forState:UIControlStateNormal];
-        self.btnLocation.enabled = true;
+        self.btnLocation.enabled = false;
         self.btnNearBy.enabled = true;
         self.btnNotification.enabled = true;
         
         
+        
     }
     else{
         
@@ -124,6 +125,7 @@ - (void)refreshView{
         [self.imgViewBattery setImage:[UIImage imageNamed:@"Battery_I"]];
         self.btnNearBy.enabled = false;
         self.btnNotification.enabled = false;
+        self.btnLocation.enabled = true;
     }
 }
 
diff --git a/HeroApp/HeroApp/Controls/InfoViewController.m b/HeroApp/HeroApp/Controls/InfoViewController.m
index 62a4d0f..d763160 100644
--- a/HeroApp/HeroApp/Controls/InfoViewController.m
+++ b/HeroApp/HeroApp/Controls/InfoViewController.m
@@ -16,8 +16,10 @@ @implementation InfoViewController
 
 - (void)viewDidLoad {
     [super viewDidLoad];
-
+    
     self.title = @"Settings Info";
+    self.navigationController.navigationItem.title = @"";
+    
     self.innerView.layer.cornerRadius = 3.0f;
     self.scrollView.layer.cornerRadius = 3.0f;
 }
@@ -27,6 +29,7 @@ - (void)didReceiveMemoryWarning {
     // Dispose of any resources that can be recreated.
 }
 
+
 /*
 #pragma mark - Navigation
 
diff --git a/HeroApp/HeroApp/Controls/LocationViewController.m b/HeroApp/HeroApp/Controls/LocationViewController.m
index 124184d..80cf9ce 100644
--- a/HeroApp/HeroApp/Controls/LocationViewController.m
+++ b/HeroApp/HeroApp/Controls/LocationViewController.m
@@ -10,6 +10,16 @@
 #import "JPSThumbnailAnnotation.h"
 #import <QuartzCore/QuartzCore.h>
 
+@interface MyCustomAnnotation : NSObject <MKAnnotation> {
+    CLLocationCoordinate2D coordinate;
+}
+@property (nonatomic, readonly) CLLocationCoordinate2D coordinate;
+- (id)initWithLocation:(CLLocationCoordinate2D)coord;
+
+
+// Other methods and properties.
+@end
+
 @interface LocationViewController ()
 
 @end
@@ -23,7 +33,8 @@ @implementation LocationViewController
 - (void)viewDidLoad {
     [super viewDidLoad];
     
-    self.title = self.actor.state[@"name"];
+    //Hiro's name in location screen
+    self.title = self.actor.state[kDeviceName];
     self.mapView.layer.cornerRadius = 3.0f;
     self.mapView.showsUserLocation = NO;
     self.mapView.delegate = self;
@@ -115,14 +126,16 @@ - (NSArray *)annotations {
     }
     
     apple.title = self.actor.state[kDeviceName];
+    apple.subtitle = @"Last Location";
     
     
     
     apple.coordinate = CLLocationCoordinate2DMake([self.actor.state[kHeroLastLocation][0]floatValue],[self.actor.state[kHeroLastLocation][1]floatValue]);
-    apple.disclosureBlock = ^{
-        DLog(@"selected Keys");
-        UIImage *image = [LocationViewController imageWithView:self.mapView];
-    };
+    
+//    apple.disclosureBlock = ^{
+//        DLog(@"selected Keys");
+//        UIImage *image = [LocationViewController imageWithView:self.mapView];
+//    };
     
     return @[[JPSThumbnailAnnotation annotationWithThumbnail:apple]];
 }
@@ -151,7 +164,7 @@ - (void)mapView:(MKMapView *)mapView didDeselectAnnotationView:(MKAnnotationView
     }
 }
 
-- (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id<MKAnnotation>)annotation {
+- (MKAnnotationView *)mapView:(MKMapView *)mapView viewForAnnotation:(id <MKAnnotation>)annotation {
     if ([annotation conformsToProtocol:@protocol(JPSThumbnailAnnotationProtocol)]) {
         return [((NSObject<JPSThumbnailAnnotationProtocol> *)annotation) annotationViewInMap:mapView];
     }
diff --git a/HeroApp/HeroApp/Controls/RootViewController.h b/HeroApp/HeroApp/Controls/RootViewController.h
index 29af17f..47bf77f 100644
--- a/HeroApp/HeroApp/Controls/RootViewController.h
+++ b/HeroApp/HeroApp/Controls/RootViewController.h
@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 
 #import "CellTableViewCell.h"
-@interface RootViewController : UIViewController<UITableViewDataSource,UITableViewDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate>
+@interface RootViewController : UIViewController<UITableViewDataSource,UITableViewDelegate,UIImagePickerControllerDelegate,UINavigationControllerDelegate, UITextFieldDelegate>
 
 @property (weak,nonatomic) IBOutlet  UITableView *tableView;
 
diff --git a/HeroApp/HeroApp/Controls/RootViewController.m b/HeroApp/HeroApp/Controls/RootViewController.m
index 3562ad4..f3a52d8 100644
--- a/HeroApp/HeroApp/Controls/RootViewController.m
+++ b/HeroApp/HeroApp/Controls/RootViewController.m
@@ -26,7 +26,6 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     selectedIndexValue = 0;
     
-    
     self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
     [self.navigationController.navigationBar
      setTitleTextAttributes:@{NSForegroundColorAttributeName : [UIColor whiteColor]}];
@@ -43,7 +42,6 @@ - (void)viewDidLoad {
       [UIFont fontWithName:@"OpenSans-Light" size:18],
       NSFontAttributeName, nil]];
     RegisterForNotes(@[@"DeviceIsReady"], self);
-
     
     
 }
@@ -75,7 +73,7 @@ - (void)deviceIsReady:(NSNotification *)note{
         
         [actor performCommand:kCommandUpdateLinkLoss withParams:[@{kCharacteristicLinkLossLevel:[NSNumber numberWithInt:linkLossLevel]}mutableCopy]];
     }
-    
+
     
 }
 
@@ -140,6 +138,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     cell.txtFieldName.delegate = (id)self;
     cell.txtFieldName.tag = indexPath.row;
     cell.btnNotification.tag = indexPath.row;
+    cell.txtFieldName.delegate = self;
     if (actor.state[@"profilePic"]) {
         cell.imgHeroPic.image = getProfileImageFromDocumentDirectory(actor.state[@"profilePic"]);
     }
@@ -164,7 +163,7 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
     [cell.btnLocation addTarget:self action:@selector(actionLocation:) forControlEvents:UIControlEventTouchUpInside];
     [cell.btnNearBy addTarget:self action:@selector(actionNearBy:) forControlEvents:UIControlEventTouchUpInside];
     [cell.btnSetting addTarget:self action:@selector(actionSettings:) forControlEvents:UIControlEventTouchUpInside];
-    
+
     
     return cell;
 }
@@ -178,6 +177,7 @@ -(void)actionLocation:(UIButton  *)sender;
 {
     selectedIndexValue = sender.tag;
     [self performSegueWithIdentifier:@"segueLocation" sender:self];
+    
 }
 
 -(void)actionNearBy:(UIButton  *)sender;
@@ -236,9 +236,19 @@ - (void)textFieldDidBeginEditing:(UITextField *)textField
 -(void)textFieldDidEndEditing:(UITextField *)textField
 {
     HeroActor *actor = AppDelegate_.deviceActors[textField.tag];
-    if([textField.text length]!=0){
-        actor.state[kDeviceName] = textField.text;
+    NSString *actorName = [textField.text stringByTrimmingCharactersInSet: [NSCharacterSet whitespaceCharacterSet]];
+    
+    if([actorName length] != 0){
+        actor.state[kDeviceName] = actorName;
+        textField.text = actorName;
     }
+    else {
+        actor.state[kDeviceName] = @"My Hiro";
+        textField.text = @"My Hiro";
+    }
+    
+    [AppDelegate_ storeDevicesState];
+
     [textField resignFirstResponder];
 }
 
@@ -255,6 +265,17 @@ - (void)imagePickerControllerDidCancel:(UIImagePickerController *)picker {
     [picker dismissViewControllerAnimated:YES completion:NULL];
 }
 
+// Fix the length of the Hiro name to be 17 characters length
+-(bool) textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
+    NSUInteger length = [textField.text length] + [string length];
+    if (length > 17) {
+        return false;
+    }
+    else {
+        return true;
+        }
+    }
+
 
 
 
diff --git a/HeroApp/HeroApp/Controls/ScanTableViewController.h b/HeroApp/HeroApp/Controls/ScanTableViewController.h
index e421c60..e87b52c 100644
--- a/HeroApp/HeroApp/Controls/ScanTableViewController.h
+++ b/HeroApp/HeroApp/Controls/ScanTableViewController.h
@@ -8,7 +8,7 @@
 
 #import <UIKit/UIKit.h>
 
-@interface ScanTableViewController : UITableViewController <UIAlertViewDelegate>
+@interface ScanTableViewController : UITableViewController <UIAlertViewDelegate, UITextFieldDelegate>
 @property (weak, nonatomic) IBOutlet UIBarButtonItem *btnScan;
 
 @property (strong,nonatomic) NSMutableArray *peripherals;
diff --git a/HeroApp/HeroApp/Controls/ScanTableViewController.m b/HeroApp/HeroApp/Controls/ScanTableViewController.m
index 874601c..ee06508 100644
--- a/HeroApp/HeroApp/Controls/ScanTableViewController.m
+++ b/HeroApp/HeroApp/Controls/ScanTableViewController.m
@@ -39,6 +39,7 @@ - (void)viewDidLoad {
                   forControlEvents:UIControlEventValueChanged];
     [self startScanning];
     
+    
 
 }
 
@@ -141,11 +142,15 @@ - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath
     
     UITableViewCell *cell = [tableView cellForRowAtIndexPath:indexPath];
     cell.detailTextLabel.text = @"Pairing with device";
+    
     UIAlertView *alert = [[UIAlertView alloc] initWithTitle:@"Give your Hiro a name" message:@"Enter Name Here" delegate:self cancelButtonTitle:@"Cancel" otherButtonTitles:@"Save", nil];
     alert.alertViewStyle = UIAlertViewStylePlainTextInput;
+    [alert textFieldAtIndex:0].autocapitalizationType = UITextAutocapitalizationTypeSentences;
     
     alert.delegate = self;
     alert.tag = indexPath.row;
+    UITextField *alertTextField = [alert textFieldAtIndex:0];
+    alertTextField.delegate = self;
     [alert show];
 
 }
@@ -203,13 +208,25 @@ -(void)alertView:(UIAlertView *)alertView clickedButtonAtIndex:(NSInteger)button
             AppDelegate_.deviceLogicalName = txtLogicalName.text;
         }
         else{
-            AppDelegate_.deviceLogicalName = @"My Hero";
+            AppDelegate_.deviceLogicalName = @"My Hiro";
         }
+        
         self.selectedPeripheral = self.peripherals[alertView.tag];
         [AppDelegate_.centralManagerActor addPeripheral:self.peripherals[alertView.tag]];
     }
 }
 
+-(bool) textField:(UITextField *)textField shouldChangeCharactersInRange:(NSRange)range replacementString:(NSString *)string {
+
+    NSUInteger length = [textField.text length] + [string length];
+    if (length > 17) {
+        return false;
+    }
+    else {
+        return true;
+    }
+}
+
 - (IBAction)actionScan:(id)sender {
     UIBarButtonItem *barButton = (UIBarButtonItem *)sender;
     
diff --git a/HeroApp/HeroApp/Controls/SettingViewController.h b/HeroApp/HeroApp/Controls/SettingViewController.h
index 76bf3aa..79c4d3b 100644
--- a/HeroApp/HeroApp/Controls/SettingViewController.h
+++ b/HeroApp/HeroApp/Controls/SettingViewController.h
@@ -7,6 +7,7 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "RingToneTableViewController.h"
 
 @interface SettingViewController : UIViewController
 
diff --git a/HeroApp/HeroApp/Controls/SettingViewController.m b/HeroApp/HeroApp/Controls/SettingViewController.m
index d37dd72..b906c5f 100644
--- a/HeroApp/HeroApp/Controls/SettingViewController.m
+++ b/HeroApp/HeroApp/Controls/SettingViewController.m
@@ -22,6 +22,8 @@ - (void)viewDidLoad {
     [super viewDidLoad];
 
     self.title = @"Settings";
+    self.navigationController.navigationItem.title = @"";
+
     self.innerView.layer.cornerRadius = 3.0f;
     self.scrollView.layer.cornerRadius = 3.0f;
     UIButton* infoButton = [UIButton buttonWithType:UIButtonTypeInfoLight];
@@ -41,22 +43,6 @@ - (void)viewDidLoad {
     
 }
 
-- (void)viewWillAppear:(BOOL)animated{
-    
-    if([ReadValue(SOUND_FIND_PHONE_THUR_HIRO) isEqualToString:@"HiroTone1"]){
-        [self.btnFindPhoneAlert setTitle:@"Default ringtone >" forState:UIControlStateNormal];
-    }
-    else{
-        [self.btnFindPhoneAlert setTitle:[NSString stringWithFormat:@"%@ >",ReadValue(SOUND_FIND_PHONE_THUR_HIRO)] forState:UIControlStateNormal];
-    }
-    
-    if([self.actor.state[SOUND_PHONE_SOUND_ALERT] isEqualToString:@"HiroTone2"]){
-        [self.btnSoundAlert setTitle:@"Default ringtone >" forState:UIControlStateNormal];
-    }
-    else{
-         [self.btnSoundAlert setTitle:[NSString stringWithFormat:@"%@ >",self.actor.state[SOUND_PHONE_SOUND_ALERT]] forState:UIControlStateNormal];
-    }
-}
 - (void)didReceiveMemoryWarning {
     [super didReceiveMemoryWarning];
     // Dispose of any resources that can be recreated.
@@ -117,19 +103,25 @@ - (IBAction)PushNotificationChange:(UIButton *)sender {
 }
 - (IBAction)PhoneSoundAlert:(UIButton *)sender {
     if (sender.isSelected) {
+        [self.btnSoundAlert setTitleColor:[UIColor lightTextColor] forState:UIControlStateNormal];
         self.btnHiroSoundAlert.selected = false;
+        self.btnSoundAlert.enabled = false;
         self.actor.state[kPhoneSoundAlertISEnable] = [NSNumber numberWithBool:FALSE];
     }else{
+        [self.btnSoundAlert setTitleColor:[UIColor lightGrayColor] forState:UIControlStateNormal];
         self.btnHiroSoundAlert.selected = true;
+        self.btnSoundAlert.enabled = true;
         self.actor.state[kPhoneSoundAlertISEnable] = [NSNumber numberWithBool:TRUE];
     }
 }
 - (IBAction)HiroBeepAlert:(UIButton *)sender {
     if (sender.isSelected) {
         self.btnBeepAlert.selected = false;
-        self.actor.state[kHeroAlertIsEnable] = [NSNumber numberWithBool:FALSE];;
+        self.segHiroBeepAlert.enabled = false;
+        self.actor.state[kHeroAlertIsEnable] = [NSNumber numberWithBool:FALSE];
     }else{
         self.btnBeepAlert.selected = true;
+        self.segHiroBeepAlert.enabled = true;
         self.actor.state[kHeroAlertIsEnable] = [NSNumber numberWithBool:TRUE];
     }
     [self checkAndUpdateLinkLoss];
@@ -140,6 +132,7 @@ - (IBAction)actionDelete:(id)sender {
         if(yes){
             
             if (self.actor) {
+
                 [AppDelegate_.centralManagerActor.centralManager cancelPeripheralConnection:self.actor.peripheralActor.peripheral];
                 
                 self.actor.peripheralActor.peripheral.delegate = nil;
@@ -187,4 +180,46 @@ - (IBAction)actionPhoneThroughFeature:(id)sender {
     index = 2;
     [self performSegueWithIdentifier:@"segueringtone" sender:self];
 }
+
+// Changed viewWillAppear for viewDidAppear to fix button status issue(swipe)
+- (void)viewDidAppear:(BOOL)animated {
+    [super viewDidAppear:animated];
+    [self updateButtonRingtoneButtons];
+    [self updateButtonsActiveStatus];
+}
+
+-(void)updateButtonsActiveStatus {
+    
+    bool alertIsEnabled = [self.actor.state[kPhoneSoundAlertISEnable] boolValue];
+    bool beepIsEnabled = [self.actor.state[kHeroAlertIsEnable] boolValue];
+    if (!alertIsEnabled) {
+        [self.btnSoundAlert setTitleColor:[UIColor lightTextColor] forState:UIControlStateNormal];
+    }
+
+    self.btnHiroSoundAlert.selected = alertIsEnabled;
+    self.btnSoundAlert.enabled = alertIsEnabled;
+    self.btnBeepAlert.selected = beepIsEnabled;
+    self.segHiroBeepAlert.enabled = beepIsEnabled;
+    
+}
+
+-(void)updateButtonRingtoneButtons {
+    
+    
+    if([ReadValue(SOUND_FIND_PHONE_THUR_HIRO) isEqualToString:@"HiroTone1"]){
+        [self.btnFindPhoneAlert setTitle:@"Default ringtone >" forState:UIControlStateNormal];
+    }
+    else{
+        [self.btnFindPhoneAlert setTitle:[NSString stringWithFormat:@"%@ >",ReadValue(SOUND_FIND_PHONE_THUR_HIRO)] forState:UIControlStateNormal];
+    }
+    
+    if([self.actor.state[SOUND_PHONE_SOUND_ALERT] isEqualToString:@"HiroTone2"]){
+        [self.btnSoundAlert setTitle:@"Default ringtone >" forState:UIControlStateNormal];
+    }
+    else{
+        [self.btnSoundAlert setTitle:[NSString stringWithFormat:@"%@ >", self.actor.state[SOUND_PHONE_SOUND_ALERT]] forState:UIControlStateNormal];
+    }
+  
+    
+}
 @end
diff --git a/HeroApp/HeroApp/Controls/WiFiSafeZoneViewController.m b/HeroApp/HeroApp/Controls/WiFiSafeZoneViewController.m
index d19cdc4..375937f 100644
--- a/HeroApp/HeroApp/Controls/WiFiSafeZoneViewController.m
+++ b/HeroApp/HeroApp/Controls/WiFiSafeZoneViewController.m
@@ -18,6 +18,10 @@ - (void)viewDidLoad {
     [super viewDidLoad];
     // Do any additional setup after loading the view.
     
+    self.title = @"Wi-Fi Safe Zones";
+
+    self.navigationController.navigationItem.title = @"";
+    
     self.navigationController.navigationBar.tintColor = [UIColor whiteColor];
     [self.navigationController.navigationBar
      setTitleTextAttributes:@{NSForegroundColorAttributeName : [UIColor whiteColor]}];
@@ -36,10 +40,9 @@ - (void)viewDidLoad {
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(reachabilityChanged:) name:kReachabilityChangedNotification object:nil];
     
     
-    
-    
 }
 
+
 - (void)appDidBecomeActive:(NSNotification *)note {
     [self checkIfNetworkConnected];
 }
diff --git a/HeroApp/HeroApp/Info.plist b/HeroApp/HeroApp/Info.plist
index 603058a..907a916 100644
--- a/HeroApp/HeroApp/Info.plist
+++ b/HeroApp/HeroApp/Info.plist
@@ -15,11 +15,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.3</string>
+	<string>1.0.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.0.3</string>
+	<string>1.0.4</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>NSLocationAlwaysUsageDescription</key>
diff --git a/HeroApp/HeroApp/Launch Screen.xib b/HeroApp/HeroApp/Launch Screen.xib
index 12a5335..ced78ce 100644
--- a/HeroApp/HeroApp/Launch Screen.xib	
+++ b/HeroApp/HeroApp/Launch Screen.xib	
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A389" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="7706" systemVersion="14E46" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="7703"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
diff --git a/HeroApp/Hiro.xcodeproj/project.pbxproj b/HeroApp/Hiro.xcodeproj/project.pbxproj
index 3d11aea..cd11911 100644
--- a/HeroApp/Hiro.xcodeproj/project.pbxproj
+++ b/HeroApp/Hiro.xcodeproj/project.pbxproj
@@ -608,7 +608,7 @@
 				TargetAttributes = {
 					34DC7ACA1A4A60F400096FE8 = {
 						CreatedOnToolsVersion = 6.1;
-						DevelopmentTeam = A7N58S4NLP;
+						DevelopmentTeam = 7GE5FS44P2;
 						SystemCapabilities = {
 							com.apple.BackgroundModes = {
 								enabled = 1;
@@ -617,6 +617,7 @@
 					};
 					34DC7AE31A4A60F500096FE8 = {
 						CreatedOnToolsVersion = 6.1;
+						DevelopmentTeam = 7GE5FS44P2;
 						TestTargetID = 34DC7ACA1A4A60F400096FE8;
 					};
 				};
@@ -789,8 +790,8 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iOS Development: Hanysha Jagtiani (V78E5786B8)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iOS Development: Hanysha Jagtiani (V78E5786B8)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -810,7 +811,7 @@
 				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
-				PROVISIONING_PROFILE = "9033721f-4fba-411a-b3bf-050f34bb4962";
+				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 			};
 			name = Debug;
@@ -832,8 +833,8 @@
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iOS Development: Hanysha Jagtiani (V78E5786B8)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iOS Development: Hanysha Jagtiani (V78E5786B8)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -846,7 +847,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 7.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
-				PROVISIONING_PROFILE = "9033721f-4fba-411a-b3bf-050f34bb4962";
+				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
 			};
@@ -857,8 +858,8 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Jiten Chandiramani (5KM8YF4FNH)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Jiten Chandiramani (5KM8YF4FNH)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_PREFIX_HEADER = HeroApp/Resources/PrefixHeader.pch;
 				INFOPLIST_FILE = HeroApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -868,7 +869,7 @@
 					"-ObjC",
 				);
 				PRODUCT_NAME = Hiro;
-				PROVISIONING_PROFILE = "aabe7536-cd0a-4a09-bbea-35822fd7198c";
+				PROVISIONING_PROFILE = "";
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Debug;
@@ -878,8 +879,8 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Jiten Chandiramani (5KM8YF4FNH)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer: Jiten Chandiramani (5KM8YF4FNH)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_PREFIX_HEADER = HeroApp/Resources/PrefixHeader.pch;
 				INFOPLIST_FILE = HeroApp/Info.plist;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
@@ -889,7 +890,7 @@
 					"-ObjC",
 				);
 				PRODUCT_NAME = Hiro;
-				PROVISIONING_PROFILE = "aabe7536-cd0a-4a09-bbea-35822fd7198c";
+				PROVISIONING_PROFILE = "";
 				TARGETED_DEVICE_FAMILY = 1;
 			};
 			name = Release;
@@ -898,7 +899,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_IDENTITY = "iPhone Developer: Jiten Chandiramani (5KM8YF4FNH)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -910,8 +912,8 @@
 				INFOPLIST_FILE = HeroAppTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = HiroTests;
-				PROVISIONING_PROFILE = "aabe7536-cd0a-4a09-bbea-35822fd7198c";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HeroApp.app/HeroApp";
+				PROVISIONING_PROFILE = "";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Hiro.app/Hiro";
 			};
 			name = Debug;
 		};
@@ -919,7 +921,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				BUNDLE_LOADER = "$(TEST_HOST)";
-				CODE_SIGN_IDENTITY = "iPhone Developer: Jiten Chandiramani (5KM8YF4FNH)";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				FRAMEWORK_SEARCH_PATHS = (
 					"$(SDKROOT)/Developer/Library/Frameworks",
 					"$(inherited)",
@@ -927,8 +930,8 @@
 				INFOPLIST_FILE = HeroAppTests/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_NAME = HiroTests;
-				PROVISIONING_PROFILE = "aabe7536-cd0a-4a09-bbea-35822fd7198c";
-				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/HeroApp.app/HeroApp";
+				PROVISIONING_PROFILE = "";
+				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/Hiro.app/Hiro";
 			};
 			name = Release;
 		};
diff --git a/HeroApp/Hiro.xcodeproj/project.xcworkspace/xcshareddata/Hiro.xccheckout b/HeroApp/Hiro.xcodeproj/project.xcworkspace/xcshareddata/Hiro.xccheckout
index 900b18b..1b08742 100644
--- a/HeroApp/Hiro.xcodeproj/project.xcworkspace/xcshareddata/Hiro.xccheckout
+++ b/HeroApp/Hiro.xcodeproj/project.xcworkspace/xcshareddata/Hiro.xccheckout
@@ -10,31 +10,31 @@
 	<string>Hiro</string>
 	<key>IDESourceControlProjectOriginsDictionary</key>
 	<dict>
-		<key>E2210B7254D7386F2067BDED21DFB03C9ED64305</key>
-		<string>https://xp-dev.com/git/HeroAppIOS</string>
+		<key>23048E1C4F28F0CCDE7F160692A26B8E440CB397</key>
+		<string>https://github.com/andrefontolan/Hiro-App-iOS.git</string>
 	</dict>
 	<key>IDESourceControlProjectPath</key>
 	<string>HeroApp/Hiro.xcodeproj</string>
 	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
 	<dict>
-		<key>E2210B7254D7386F2067BDED21DFB03C9ED64305</key>
+		<key>23048E1C4F28F0CCDE7F160692A26B8E440CB397</key>
 		<string>../../..</string>
 	</dict>
 	<key>IDESourceControlProjectURL</key>
-	<string>https://xp-dev.com/git/HeroAppIOS</string>
+	<string>https://github.com/andrefontolan/Hiro-App-iOS.git</string>
 	<key>IDESourceControlProjectVersion</key>
 	<integer>111</integer>
 	<key>IDESourceControlProjectWCCIdentifier</key>
-	<string>E2210B7254D7386F2067BDED21DFB03C9ED64305</string>
+	<string>23048E1C4F28F0CCDE7F160692A26B8E440CB397</string>
 	<key>IDESourceControlProjectWCConfigurations</key>
 	<array>
 		<dict>
 			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
 			<string>public.vcs.git</string>
 			<key>IDESourceControlWCCIdentifierKey</key>
-			<string>E2210B7254D7386F2067BDED21DFB03C9ED64305</string>
+			<string>23048E1C4F28F0CCDE7F160692A26B8E440CB397</string>
 			<key>IDESourceControlWCCName</key>
-			<string>HeroAppIOS</string>
+			<string>Hiro-App-iOS</string>
 		</dict>
 	</array>
 </dict>
diff --git a/HeroApp/Hiro.xcodeproj/project.xcworkspace/xcuserdata/andre.xcuserdatad/UserInterfaceState.xcuserstate b/HeroApp/Hiro.xcodeproj/project.xcworkspace/xcuserdata/andre.xcuserdatad/UserInterfaceState.xcuserstate
new file mode 100644
index 0000000..9dd2e00
Binary files /dev/null and b/HeroApp/Hiro.xcodeproj/project.xcworkspace/xcuserdata/andre.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/HeroApp/Hiro.xcodeproj/xcuserdata/andre.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/HeroApp/Hiro.xcodeproj/xcuserdata/andre.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
new file mode 100644
index 0000000..b1547f8
--- /dev/null
+++ b/HeroApp/Hiro.xcodeproj/xcuserdata/andre.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Bucket
+   type = "1"
+   version = "2.0">
+   <Breakpoints>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "No"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "HeroApp/Controls/WiFiSafeZoneViewController.m"
+            timestampString = "459281529.170405"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "67"
+            endingLineNumber = "67"
+            landmarkName = "-checkIfNetworkConnected"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+   </Breakpoints>
+</Bucket>
diff --git a/HeroApp/Hiro.xcodeproj/xcuserdata/andre.xcuserdatad/xcschemes/Hiro.xcscheme b/HeroApp/Hiro.xcodeproj/xcuserdata/andre.xcuserdatad/xcschemes/Hiro.xcscheme
new file mode 100644
index 0000000..280e888
--- /dev/null
+++ b/HeroApp/Hiro.xcodeproj/xcuserdata/andre.xcuserdatad/xcschemes/Hiro.xcscheme
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "0630"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "34DC7ACA1A4A60F400096FE8"
+               BuildableName = "Hiro.app"
+               BlueprintName = "Hiro"
+               ReferencedContainer = "container:Hiro.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "NO"
+            buildForArchiving = "NO"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "34DC7AE31A4A60F500096FE8"
+               BuildableName = "HiroTests.xctest"
+               BlueprintName = "HiroTests"
+               ReferencedContainer = "container:Hiro.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug">
+      <Testables>
+         <TestableReference
+            skipped = "NO">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "34DC7AE31A4A60F500096FE8"
+               BuildableName = "HiroTests.xctest"
+               BlueprintName = "HiroTests"
+               ReferencedContainer = "container:Hiro.xcodeproj">
+            </BuildableReference>
+         </TestableReference>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "34DC7ACA1A4A60F400096FE8"
+            BuildableName = "Hiro.app"
+            BlueprintName = "Hiro"
+            ReferencedContainer = "container:Hiro.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </TestAction>
+   <LaunchAction
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Debug"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      allowLocationSimulation = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "34DC7ACA1A4A60F400096FE8"
+            BuildableName = "Hiro.app"
+            BlueprintName = "Hiro"
+            ReferencedContainer = "container:Hiro.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      buildConfiguration = "Release"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "34DC7ACA1A4A60F400096FE8"
+            BuildableName = "Hiro.app"
+            BlueprintName = "Hiro"
+            ReferencedContainer = "container:Hiro.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/HeroApp/Hiro.xcodeproj/xcuserdata/andre.xcuserdatad/xcschemes/xcschememanagement.plist b/HeroApp/Hiro.xcodeproj/xcuserdata/andre.xcuserdatad/xcschemes/xcschememanagement.plist
new file mode 100644
index 0000000..219af1a
--- /dev/null
+++ b/HeroApp/Hiro.xcodeproj/xcuserdata/andre.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>SchemeUserState</key>
+	<dict>
+		<key>Hiro.xcscheme</key>
+		<dict>
+			<key>orderHint</key>
+			<integer>0</integer>
+		</dict>
+	</dict>
+	<key>SuppressBuildableAutocreation</key>
+	<dict>
+		<key>34DC7ACA1A4A60F400096FE8</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+		<key>34DC7AE31A4A60F500096FE8</key>
+		<dict>
+			<key>primary</key>
+			<true/>
+		</dict>
+	</dict>
+</dict>
+</plist>