1.修改Apex Mobile Retrieve弹窗提示。

2.修改Apex Mobile Ship Search结果显示。
3.调整Apex Mobile旧有视图布局。

Apex Mobile/Apex Mobile.xcodeproj/project.pbxproj

@@ -16,6 +16,8 @@
 		42604122201C4B41002374A8 /* ShipingStatusCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 42604121201C4B41002374A8 /* ShipingStatusCell.m */; };
 		42604127201C578B002374A8 /* ShipSearchController.m in Sources */ = {isa = PBXBuildFile; fileRef = 42604126201C578B002374A8 /* ShipSearchController.m */; };
 		42604129201C57A7002374A8 /* ShipSearch.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 42604128201C57A7002374A8 /* ShipSearch.storyboard */; };
+		426E8AB9202163EC0073BA5D /* JLCustomerAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = 426E8AB6202163EC0073BA5D /* JLCustomerAlertController.m */; };
+		426E8ABA202163EC0073BA5D /* JLPresentationController.m in Sources */ = {isa = PBXBuildFile; fileRef = 426E8AB8202163EC0073BA5D /* JLPresentationController.m */; };
 		711BA6C1191E0525002EDE6F /* MessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 711BA6C0191E0525002EDE6F /* MessageViewController.m */; };
 		711BA6C4191E0553002EDE6F /* MessageItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 711BA6C3191E0553002EDE6F /* MessageItem.m */; };
 		711DC6B218C30A4800FB1749 /* TableCellEdit.m in Sources */ = {isa = PBXBuildFile; fileRef = 711DC6B118C30A4800FB1749 /* TableCellEdit.m */; };
@@ -166,6 +168,10 @@
 		42604125201C578B002374A8 /* ShipSearchController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ShipSearchController.h; sourceTree = "<group>"; };
 		42604126201C578B002374A8 /* ShipSearchController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ShipSearchController.m; sourceTree = "<group>"; };
 		42604128201C57A7002374A8 /* ShipSearch.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = ShipSearch.storyboard; sourceTree = "<group>"; };
+		426E8AB5202163EC0073BA5D /* JLCustomerAlertController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JLCustomerAlertController.h; sourceTree = "<group>"; };
+		426E8AB6202163EC0073BA5D /* JLCustomerAlertController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JLCustomerAlertController.m; sourceTree = "<group>"; };
+		426E8AB7202163EC0073BA5D /* JLPresentationController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JLPresentationController.h; sourceTree = "<group>"; };
+		426E8AB8202163EC0073BA5D /* JLPresentationController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = JLPresentationController.m; sourceTree = "<group>"; };
 		711BA6BF191E0525002EDE6F /* MessageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageViewController.h; sourceTree = "<group>"; };
 		711BA6C0191E0525002EDE6F /* MessageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageViewController.m; sourceTree = "<group>"; };
 		711BA6C2191E0553002EDE6F /* MessageItem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageItem.h; sourceTree = "<group>"; };
@@ -483,6 +489,17 @@
 			name = ShipStatusCell;
 			sourceTree = "<group>";
 		};
+		426E8AB4202163EB0073BA5D /* Alert */ = {
+			isa = PBXGroup;
+			children = (
+				426E8AB5202163EC0073BA5D /* JLCustomerAlertController.h */,
+				426E8AB6202163EC0073BA5D /* JLCustomerAlertController.m */,
+				426E8AB7202163EC0073BA5D /* JLPresentationController.h */,
+				426E8AB8202163EC0073BA5D /* JLPresentationController.m */,
+			);
+			path = Alert;
+			sourceTree = "<group>";
+		};
 		713AA79E1917366A00B44092 /* documents */ = {
 			isa = PBXGroup;
 			children = (
@@ -820,6 +837,7 @@
 		719EF8E618BB839F00EFFF5F /* Apex Mobile */ = {
 			isa = PBXGroup;
 			children = (
+				426E8AB4202163EB0073BA5D /* Alert */,
 				425CF089201EB2B500750E32 /* Refresh */,
 				715643B820198A6000B04267 /* new */,
 				71C72714191CFF11001127E0 /* message */,
@@ -1085,6 +1103,7 @@
 				719BEC1718FFAB7B00DFE987 /* ToolsPanelViewController.m in Sources */,
 				71BA502E1908ED5700D0BD31 /* CellItemHistory.m in Sources */,
 				719A51A518C5A4AF0080C075 /* SimpleGrid.m in Sources */,
+				426E8AB9202163EC0073BA5D /* JLCustomerAlertController.m in Sources */,
 				71A003FF18D6BFB40057CDFD /* ChangePasswordViewController.m in Sources */,
 				42604122201C4B41002374A8 /* ShipingStatusCell.m in Sources */,
 				71CEE38A18CB749E00052C63 /* DetailPageViewController.m in Sources */,
@@ -1115,6 +1134,7 @@
 				719A51BA18C5AB7B0080C075 /* SimpleGridComponent.m in Sources */,
 				71570996202157A600EFE5C5 /* RAUtils.m in Sources */,
 				715643BB20198A9900B04267 /* RootViewController.m in Sources */,
+				426E8ABA202163EC0073BA5D /* JLPresentationController.m in Sources */,
 				719EF8ED18BB839F00EFFF5F /* main.m in Sources */,
 				717D76EB18C7F8120070302D /* Reachability.m in Sources */,
 				715709A720215B5100EFE5C5 /* ioapi.c in Sources */,

Apex Mobile/Apex Mobile/Alert/JLCustomerAlertController.h

@@ -0,0 +1,13 @@
+//
+//  JLAlertController.h
+//  Apex Mobile
+//
+//  Created by Jack on 2018/1/31.
+//  Copyright © 2018年 United Software Applications, Inc. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface JLCustomerAlertController : UIViewController
+
+@end

Apex Mobile/Apex Mobile/Alert/JLCustomerAlertController.m

@@ -0,0 +1,86 @@
+//
+//  JLAlertController.m
+//  Apex Mobile
+//
+//  Created by Jack on 2018/1/31.
+//  Copyright © 2018年 United Software Applications, Inc. All rights reserved.
+//
+
+#import "JLCustomerAlertController.h"
+#import "JLPresentationController.h"
+
+@interface JLCustomerAlertController () <UIViewControllerTransitioningDelegate>
+
+@end
+
+@implementation JLCustomerAlertController
+
+- (void)comonInit {
+    // present
+    self.transitioningDelegate = self;
+    /**
+     * 非Customer时，
+     * Present会将FromVC.view从Window移除
+     * Dismiss动画结束后VC.view自动添加到Window
+     */
+    self.modalPresentationStyle = UIModalPresentationCustom;
+}
+
+- (instancetype)initWithCoder:(NSCoder *)coder {
+    self = [super initWithCoder:coder];
+    if (self) {
+        [self comonInit];
+    }
+    return self;
+}
+
+- (instancetype)init {
+    if (self = [super init]) {
+        [self comonInit];
+    }
+    return self;
+}
+
+- (instancetype)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
+    if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) {
+        [self comonInit];
+    }
+    return self;
+}
+
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+    
+    self.view.backgroundColor = [UIColor whiteColor];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+#pragma mark - UIViewControllerTransitioningDelegate
+// ios 8
+- (UIPresentationController *)presentationControllerForPresentedViewController:(UIViewController *)presented presentingViewController:(UIViewController *)presenting sourceViewController:(UIViewController *)source {
+    return [[JLPresentationController alloc] initWithPresentedViewController:presented presentingViewController:presenting];
+}
+
+#pragma mark - Animator
+
+// present
+- (id<UIViewControllerAnimatedTransitioning>)animationControllerForPresentedController:(UIViewController *)presented presentingController:(UIViewController *)presenting sourceController:(UIViewController *)source {
+    
+    return nil;
+}
+
+// dismiss
+- (id<UIViewControllerAnimatedTransitioning>)animationControllerForDismissedController:(UIViewController *)dismissed {
+   
+    return nil;
+    
+}
+
+
+@end

Apex Mobile/Apex Mobile/Alert/JLPresentationController.h

@@ -0,0 +1,13 @@
+//
+//  JLPresentationController.h
+//  JLTransitionDemo
+//
+//  Created by Jack on 2017/11/20.
+//  Copyright © 2017年 buakaw. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface JLPresentationController : UIPresentationController
+
+@end

Apex Mobile/Apex Mobile/Alert/JLPresentationController.m

@@ -0,0 +1,96 @@
+//
+//  JLPresentationController.m
+//  JLTransitionDemo
+//
+//  Created by Jack on 2017/11/20.
+//  Copyright © 2017年 buakaw. All rights reserved.
+//
+
+#import "JLPresentationController.h"
+
+@interface JLPresentationController ()
+
+@property (nonatomic,strong) UIView *dimmingView;
+
+@end
+
+@implementation JLPresentationController
+
+- (UIView *)dimmingView {
+    if (!_dimmingView) {
+        _dimmingView = [UIView new];
+        _dimmingView.backgroundColor = [UIColor grayColor];
+    }
+    return _dimmingView;
+}
+
+- (void)presentationTransitionWillBegin {
+    self.dimmingView.frame = self.containerView.bounds;
+    self.dimmingView.alpha = 0.f;
+    
+    self.presentedView.layer.cornerRadius = 10.0f;
+    self.presentedView.layer.masksToBounds = YES;
+    
+    [self.containerView addSubview:self.dimmingView];
+    [self.containerView addSubview:self.presentedView];
+    
+    // 确保我们的动画与其他动画一道儿播放。
+    id<UIViewControllerTransitionCoordinator> transitionCoordiantor = self.presentedViewController.transitionCoordinator;
+    [transitionCoordiantor animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+        self.dimmingView.alpha = .4f;
+    } completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+        
+    }];
+}
+
+- (void)presentationTransitionDidEnd:(BOOL)completed {
+    if (completed) {
+//        [self.dimmingView removeFromSuperview];
+    }
+}
+
+- (CGRect)frameOfPresentedViewInContainerView {
+    CGSize size = self.containerView.bounds.size;
+    
+    UIViewController *presentedVC = self.presentedViewController;
+    size = presentedVC.preferredContentSize;
+    if (size.width <= 0 || size.height <= 0) {
+        size = self.containerView.bounds.size;
+    }
+    
+    CGFloat w = CGRectGetWidth(self.containerView.bounds);
+    CGFloat h = CGRectGetHeight(self.containerView.bounds);
+    
+    return CGRectMake((w - size.width) * 0.5, (h - size.height) * 0.5, size.width, size.height);
+}
+
+- (void)dismissalTransitionWillBegin {
+    // 确保我们的动画与其他动画一道儿播放。
+    id<UIViewControllerTransitionCoordinator> transitionCoordiantor = self.presentedViewController.transitionCoordinator;
+    [transitionCoordiantor animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+        self.dimmingView.alpha = 0.f;
+    } completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+        
+    }];
+}
+
+- (void)dismissalTransitionDidEnd:(BOOL)completed {
+    if (completed) {
+//        [self.dimmingView removeFromSuperview];
+    }
+}
+
+// 屏幕旋转调用此方法
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator {
+    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+    
+    [coordinator animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+        self.dimmingView.frame = self.containerView.bounds;
+        self.presentedView.frame = [self frameOfPresentedViewInContainerView];
+    } completion:^(id<UIViewControllerTransitionCoordinatorContext>  _Nonnull context) {
+        
+    }];
+}
+
+
+@end

Apex Mobile/Apex Mobile/Apex Mobile-Info.plist

@@ -54,8 +54,6 @@
 	<key>UISupportedInterfaceOrientations</key>
 	<array>
 		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>

Apex Mobile/Apex Mobile/Base.lproj/Main_iPhone.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES" initialViewController="Lfr-X7-cX2">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" colorMatched="YES" initialViewController="Lfr-X7-cX2">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <customFonts key="customFonts">
@@ -137,7 +137,7 @@
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rect_market_news" id="RDj-NJ-4Eq">
-                                                    <rect key="frame" x="5" y="0.0" width="120" height="65"/>
+                                                    <rect key="frame" x="5" y="0.0" width="120" height="64"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                 </imageView>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="9SA-UD-Ia4">
@@ -615,7 +615,7 @@
                                         <rect key="frame" x="0.0" y="35" width="375" height="162"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="7IQ-wj-NkY" id="GdM-Fp-oqo">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="161.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="162"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <datePicker contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" datePickerMode="date" minuteInterval="1" id="Z5G-Y5-ds6">
@@ -636,7 +636,7 @@
                                         <rect key="frame" x="0.0" y="217" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="15O-rS-EPp" id="lEL-33-nRJ">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Reset" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="IFF-VV-0Iy">
@@ -653,7 +653,7 @@
                                         <rect key="frame" x="0.0" y="261" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9kO-bH-eX1" id="aHM-xS-NEk">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Set" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lY5-Jh-Clt">
@@ -674,7 +674,7 @@
                                         <rect key="frame" x="0.0" y="325" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="ygy-KP-wsg" id="NdB-mS-bP1">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Cancel" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="vSO-nz-zfB">
@@ -740,7 +740,7 @@
                                         <rect key="frame" x="0.0" y="22" width="320" height="162"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="JUj-Tc-XSa" id="YjG-hM-a3a">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="161.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="162"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -748,7 +748,7 @@
                                         <rect key="frame" x="0.0" y="184" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="x2p-1k-evv" id="zH5-8f-JuE">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -756,7 +756,7 @@
                                         <rect key="frame" x="0.0" y="228" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="9sx-WL-iYT" id="t6i-iY-QyV">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -764,7 +764,7 @@
                                         <rect key="frame" x="0.0" y="272" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="3x4-Y5-OTz" id="gtN-yM-KzA">
-                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                         </tableViewCellContentView>
                                     </tableViewCell>
@@ -916,7 +916,7 @@
                                         <rect key="frame" x="0.0" y="22" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="1nr-UE-sjD" id="U3J-V7-tmK">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="d7g-gu-2Bj">
@@ -986,7 +986,7 @@
                                         <rect key="frame" x="0.0" y="22" width="375" height="175"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="EfP-7H-xCp" id="Jbk-8t-6hJ">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="174.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="175"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <view contentMode="scaleToFill" id="knk-RT-xyF" customClass="RTLabel">
@@ -1191,7 +1191,7 @@
                                         <rect key="frame" x="0.0" y="22" width="375" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="jDh-7c-gCD" id="Axw-St-rkx">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="64.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="65"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="88c-TS-KE4">
@@ -1249,7 +1249,7 @@
                                         <rect key="frame" x="0.0" y="22" width="375" height="65"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="80g-kB-WKb" id="Ee7-g5-fxB">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="64.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="65"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Tbi-T9-Pvc">
@@ -1303,7 +1303,7 @@
                                         <rect key="frame" x="0.0" y="22" width="375" height="82"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="iac-Br-7r3" id="wtN-3O-EkS">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="81.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="82"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="edit_from" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="From" minimumFontSize="17" id="1dN-ax-3F0">
@@ -1344,7 +1344,7 @@
                                         <rect key="frame" x="0.0" y="104" width="375" height="82"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BUG-pB-vcX" id="js5-x6-gQS">
-                                            <rect key="frame" x="0.0" y="0.0" width="342" height="81.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" height="82"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="item_bool" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="eNm-LN-2nb">
@@ -1377,7 +1377,7 @@
                                         <rect key="frame" x="0.0" y="186" width="375" height="82"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="f2w-op-UbP" id="fm5-gE-SU9">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="81.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="82"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="item_edit" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="o4R-Ty-ekY">
@@ -1607,7 +1607,7 @@
                                         <rect key="frame" x="0.0" y="22" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="kEc-ry-FUE" id="NrT-7f-68x">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="DQc-Zc-cKV">
@@ -1627,7 +1627,7 @@
                                         <rect key="frame" x="0.0" y="66" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="uk7-8Q-Bzs" id="2mb-pG-gFu">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="44"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8x8-BT-h8l">
@@ -1653,7 +1653,7 @@
                                         <rect key="frame" x="0.0" y="110" width="375" height="164"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="oB9-1g-IyB" id="v6M-bZ-rGB">
-                                            <rect key="frame" x="0.0" y="0.0" width="375" height="163.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="164"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <webView contentMode="scaleToFill" id="Iti-Af-rqF">

Apex Mobile/Apex Mobile/ChangePasswordViewController.h

@@ -8,7 +8,9 @@
 
 #import <UIKit/UIKit.h>
 #import "RANetwork.h"
-@interface ChangePasswordViewController : UIViewController<UITextFieldDelegate>
+#import "JLCustomerAlertController.h"
+
+@interface ChangePasswordViewController : JLCustomerAlertController<UITextFieldDelegate>
 @property (strong, nonatomic) IBOutlet UITextField *editOld;
 @property (strong, nonatomic) IBOutlet UITextField *editNew;
 @property (strong, nonatomic) IBOutlet UITextField *editConfirm;

Apex Mobile/Apex Mobile/ChangePasswordViewController.m

@@ -90,7 +90,8 @@
                 
                 UIAlertView * alert = [[UIAlertView alloc] initWithTitle:NSLocalizedString(@"alert_title_success", nil) message:NSLocalizedString(@"alert_msg_change_success", nil) delegate:nil cancelButtonTitle:NSLocalizedString(@"ok", nil) otherButtonTitles:nil, nil];
                 [alert show];
-                [self.navigationController popViewControllerAnimated:true ];
+//                [self.navigationController popViewControllerAnimated:true ];
+                [self dismissViewControllerAnimated:YES completion:nil];
             }
             else
             {
@@ -105,6 +106,7 @@
     
 }
 - (IBAction)onCancel:(UIButton *)sender {
+    [self dismissViewControllerAnimated:YES completion:nil];
 }
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
     [[self view] endEditing:YES];

Apex Mobile/Apex Mobile/CustomizeFieldViewController.m

@@ -338,8 +338,23 @@
         aname = self.displayfields[indexPath.row];
     else
         aname = self.hidefields[indexPath.row];
-    cell.textLabel.text = aname;
+//    cell.textLabel.text = aname;
  
+    UILabel *lb = [cell viewWithTag:1234];
+    if (lb == nil) {
+        
+        CGFloat w = CGRectGetWidth(cell.bounds);
+        CGFloat h = CGRectGetHeight(cell.bounds);
+        
+        lb = [[UILabel alloc] initWithFrame:CGRectMake(10, 0, w - 10 - 52, h)];
+        lb.textColor = [UIColor blackColor];
+        lb.font = [UIFont systemFontOfSize:18.0f];
+        lb.tag = 1234;
+        [cell addSubview:lb];
+        [cell bringSubviewToFront:lb];
+        
+    }
+    lb.text = aname;
     
     return cell;
     

Apex Mobile/Apex Mobile/HomeViewController.m

@@ -178,32 +178,33 @@
 }
 
 - (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
-NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
-
-[params setObject:@"dumb" forKey:@"id"];
-NSString* h_field;
-//if(self.radioContainer.selected==true)
-//{
-//    [params setObject:@"1" forKey:@"criterion_type"];
-//    h_field = @"ctnr";
-//}
-//else
-{
-    [params setObject:@"0" forKey:@"criterion_type"];
-    h_field = @"h_bol";
-}
     
-    NSDictionary *item = [self.shipArray objectAtIndex:indexPath.section];
-NSString * cargo_criterion = item[@"hbol"];
-if(cargo_criterion==nil)
-cargo_criterion=@"";
-[params setObject:cargo_criterion forKey:@"cargo_criterion"];
+    NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
+
+    [params setObject:@"dumb" forKey:@"id"];
+    NSString* h_field;
+    //if(self.radioContainer.selected==true)
+    //{
+    //    [params setObject:@"1" forKey:@"criterion_type"];
+    //    h_field = @"ctnr";
+    //}
+    //else
+    {
+        [params setObject:@"0" forKey:@"criterion_type"];
+        h_field = @"h_bol";
+    }
+    
+        NSDictionary *item = [self.shipArray objectAtIndex:indexPath.section];
+    NSString * cargo_criterion = item[@"hbol"];
+    if(cargo_criterion==nil)
+    cargo_criterion=@"";
+    [params setObject:cargo_criterion forKey:@"cargo_criterion"];
 
 
-[ApexMobileDB savehistory:h_field value:cargo_criterion];
+    [ApexMobileDB savehistory:h_field value:cargo_criterion];
 
-DetailTabBarController *detailViewController=[[DetailTabBarController alloc] init:@"Cargo Tracking" actions:[NSArray arrayWithObjects:@"Tracking",nil] params:params];
-[self.navigationController pushViewController:detailViewController animated:YES];
+    DetailTabBarController *detailViewController=[[DetailTabBarController alloc] init:@"Cargo Tracking" actions:[NSArray arrayWithObjects:@"Tracking",nil] params:params];
+    [self.navigationController pushViewController:detailViewController animated:YES];
     
 }
 //#pragma mark - SearchBar Delegate

Apex Mobile/Apex Mobile/LoginViewController.h

@@ -11,6 +11,7 @@
 #import "AESCrypt.h"
 #import "const.h"
 
+
 @interface LoginViewController : UIViewController<UITextFieldDelegate>
 
 @property (nonatomic , copy) void (^loginSuccessful)(void);

Apex Mobile/Apex Mobile/LoginViewController.m

@@ -7,6 +7,7 @@
 //
 
 #import "LoginViewController.h"
+#import "RetrievePasswordViewController.h"
 
 @interface LoginViewController ()
 
@@ -15,7 +16,12 @@
 @implementation LoginViewController
 
 - (IBAction)RetrieveButtonClick:(UIButton *)sender {
-    [self performSegueWithIdentifier:@"RETRIEVE" sender:self];
+//    [self performSegueWithIdentifier:@"RETRIEVE" sender:self];
+    
+    RetrievePasswordViewController *vc = [self.storyboard instantiateViewControllerWithIdentifier:@"RetrievePasswordViewController"];
+    vc.preferredContentSize = CGSizeMake(330, 160);
+    [self presentViewController:vc animated:YES completion:nil];
+    
 }
 
 
@@ -149,6 +155,34 @@
     // Do any additional setup after loading the view, typically from a nib.
 }
 
+- (void)viewWillAppear:(BOOL)animated {
+    [super viewWillAppear:animated];
+    
+    
+    [self clearNavigationbar];
+    [self configureNavigationBar];
+}
+
+- (void)clearNavigationbar {
+    self.tabBarController.navigationItem.leftBarButtonItem = nil;
+    self.tabBarController.navigationItem.leftBarButtonItems = nil;
+    self.tabBarController.navigationItem.titleView = nil;
+    self.tabBarController.navigationItem.title = nil;
+    self.tabBarController.navigationItem.rightBarButtonItem = nil;
+    self.tabBarController.navigationItem.rightBarButtonItems = nil;
+}
+
+- (void)configureNavigationBar {
+    
+    if (self.navigationController && !self.navigationController.isNavigationBarHidden) {
+        
+        UIImage *logo = [[UIImage imageNamed:@"apexlogo-2"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal];
+        UIBarButtonItem *logoItem = [[UIBarButtonItem alloc] initWithImage:logo landscapeImagePhone:logo style:UIBarButtonItemStylePlain target:nil action:nil];
+        logoItem.enabled = NO;
+        self.tabBarController.navigationItem.leftBarButtonItem = logoItem;
+    }
+}
+
 
 - (void)didReceiveMemoryWarning
 {
@@ -213,4 +247,14 @@
     }
     
 }
+
+- (void)alertTitle:(NSString *)title withMessage:(NSString *)msg {
+    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:title message:msg preferredStyle:UIAlertControllerStyleAlert];
+    UIAlertAction *okAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"ok", nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        
+    }];
+    [alertVC addAction:okAction];
+    [self presentViewController:alertVC animated:YES completion:nil];
+}
+
 @end

Apex Mobile/Apex Mobile/Main.storyboard

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13771" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="YOs-rL-bRV">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="13529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="YOs-rL-bRV">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment version="2304" identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13772"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13527"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -136,46 +136,65 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="User" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="dHA-PV-ECL">
-                                <rect key="frame" x="20" y="220" width="335" height="30"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <textInputTraits key="textInputTraits" returnKeyType="done"/>
-                            </textField>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="O5q-tH-vch">
-                                <rect key="frame" x="20" y="269" width="335" height="30"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
-                                <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
-                            </textField>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vvk-xp-NJf">
-                                <rect key="frame" x="317" y="317" width="38" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
-                                <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
-                                <state key="normal" title="Login">
-                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </state>
-                                <connections>
-                                    <action selector="LoginButtonClick:" destination="RGM-u2-C1G" eventType="touchUpInside" id="R82-Lg-fey"/>
-                                </connections>
-                            </button>
-                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LxN-nX-R7q">
-                                <rect key="frame" x="20" y="317" width="130" height="32"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxY="YES"/>
-                                <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="15"/>
-                                <state key="normal" title="  Save password" image="unchecked_32">
-                                    <color key="titleColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                    <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                                </state>
-                            </button>
-                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="wIj-4p-xEI">
-                                <rect key="frame" x="210" y="318" width="20" height="20"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
-                            </activityIndicatorView>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OnO-n9-f7N">
+                                <rect key="frame" x="0.0" y="268.5" width="375" height="130"/>
+                                <subviews>
+                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="User" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="dHA-PV-ECL">
+                                        <rect key="frame" x="20" y="0.0" width="335" height="30"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="335" id="bAR-Fg-jKi"/>
+                                            <constraint firstAttribute="height" constant="30" id="yn6-o8-hfY"/>
+                                        </constraints>
+                                        <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <textInputTraits key="textInputTraits" returnKeyType="done"/>
+                                    </textField>
+                                    <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Password" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="O5q-tH-vch">
+                                        <rect key="frame" x="20" y="50" width="335" height="30"/>
+                                        <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                        <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
+                                    </textField>
+                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="vvk-xp-NJf">
+                                        <rect key="frame" x="317" y="100" width="38" height="30"/>
+                                        <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
+                                        <state key="normal" title="Login">
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        </state>
+                                        <connections>
+                                            <action selector="LoginButtonClick:" destination="RGM-u2-C1G" eventType="touchUpInside" id="R82-Lg-fey"/>
+                                        </connections>
+                                    </button>
+                                    <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="LxN-nX-R7q">
+                                        <rect key="frame" x="20" y="106" width="127" height="18"/>
+                                        <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
+                                        <fontDescription key="fontDescription" type="system" pointSize="15"/>
+                                        <state key="normal" title="  Save password" image="unchecked_32">
+                                            <color key="titleColor" red="0.0" green="0.50196081400000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                            <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                        </state>
+                                    </button>
+                                    <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="wIj-4p-xEI">
+                                        <rect key="frame" x="287" y="105" width="20" height="20"/>
+                                        <inset key="insetFor6xAndEarlier" minX="0.0" minY="70" maxX="0.0" maxY="-70"/>
+                                    </activityIndicatorView>
+                                </subviews>
+                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                <constraints>
+                                    <constraint firstItem="wIj-4p-xEI" firstAttribute="centerY" secondItem="vvk-xp-NJf" secondAttribute="centerY" id="1ee-v1-ma7"/>
+                                    <constraint firstItem="vvk-xp-NJf" firstAttribute="leading" secondItem="wIj-4p-xEI" secondAttribute="trailing" constant="10" id="2k3-aM-P3v"/>
+                                    <constraint firstItem="LxN-nX-R7q" firstAttribute="centerY" secondItem="vvk-xp-NJf" secondAttribute="centerY" id="5Ox-oC-RkB"/>
+                                    <constraint firstItem="dHA-PV-ECL" firstAttribute="top" secondItem="OnO-n9-f7N" secondAttribute="top" id="5cO-ce-YEk"/>
+                                    <constraint firstItem="O5q-tH-vch" firstAttribute="centerX" secondItem="OnO-n9-f7N" secondAttribute="centerX" id="9eJ-iH-oTl"/>
+                                    <constraint firstItem="LxN-nX-R7q" firstAttribute="leading" secondItem="O5q-tH-vch" secondAttribute="leading" id="AeB-jY-RRd"/>
+                                    <constraint firstItem="vvk-xp-NJf" firstAttribute="top" secondItem="O5q-tH-vch" secondAttribute="bottom" constant="20" id="Gra-Tq-Fi8"/>
+                                    <constraint firstItem="dHA-PV-ECL" firstAttribute="centerX" secondItem="OnO-n9-f7N" secondAttribute="centerX" id="QII-AH-rLY"/>
+                                    <constraint firstItem="O5q-tH-vch" firstAttribute="width" secondItem="dHA-PV-ECL" secondAttribute="width" id="cmr-UO-Edb"/>
+                                    <constraint firstItem="O5q-tH-vch" firstAttribute="top" secondItem="dHA-PV-ECL" secondAttribute="bottom" constant="20" id="e9m-LC-gPr"/>
+                                    <constraint firstAttribute="height" constant="130" id="kso-Dj-NnP"/>
+                                    <constraint firstItem="vvk-xp-NJf" firstAttribute="trailing" secondItem="O5q-tH-vch" secondAttribute="trailing" id="pAX-io-GU3"/>
+                                </constraints>
+                            </view>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Hzc-kg-csR">
                                 <rect key="frame" x="124.5" y="564" width="126" height="30"/>
                                 <state key="normal" title="Retrieve password"/>
@@ -198,6 +217,9 @@
                             <constraint firstItem="zKh-Ur-Gus" firstAttribute="top" secondItem="Fgn-Jb-we3" secondAttribute="bottom" constant="29" id="NCe-W2-EeK"/>
                             <constraint firstItem="zKh-Ur-Gus" firstAttribute="centerX" secondItem="lHV-oi-ARt" secondAttribute="centerX" id="de4-gF-h5y"/>
                             <constraint firstItem="deU-wF-9js" firstAttribute="top" secondItem="Hzc-kg-csR" secondAttribute="bottom" constant="24" id="fbS-Mb-Anu"/>
+                            <constraint firstItem="OnO-n9-f7N" firstAttribute="width" secondItem="lHV-oi-ARt" secondAttribute="width" id="jGj-UK-dEj"/>
+                            <constraint firstItem="OnO-n9-f7N" firstAttribute="centerY" secondItem="lHV-oi-ARt" secondAttribute="centerY" id="raF-GG-xW9"/>
+                            <constraint firstItem="OnO-n9-f7N" firstAttribute="centerX" secondItem="lHV-oi-ARt" secondAttribute="centerX" id="vXY-JI-MLZ"/>
                         </constraints>
                     </view>
                     <tabBarItem key="tabBarItem" title="Login" image="tab_login" id="Tch-x6-pfY"/>
@@ -211,12 +233,11 @@
                         <outlet property="editUser" destination="dHA-PV-ECL" id="mAU-kL-bDw"/>
                         <outlet property="loginButton" destination="vvk-xp-NJf" id="8CI-V3-a6b"/>
                         <outlet property="mum" destination="wIj-4p-xEI" id="3zo-bA-MZw"/>
-                        <segue destination="6Nv-Co-XiD" kind="presentation" identifier="RETRIEVE" id="00y-ck-owd"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Dne-E0-wdc" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="657" y="-2448"/>
+            <point key="canvasLocation" x="656.79999999999995" y="-2448.1259370314842"/>
         </scene>
         <!--Home-->
         <scene sceneID="eIc-Na-UuH">
@@ -363,9 +384,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" scrollEnabled="NO" editable="NO" text="version:
Support:
usairedadt@united-us.net" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="qjb-87-KPo">
-                                <rect key="frame" x="20" y="65" width="280" height="257"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES"/>
+                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" editable="NO" text="version:
Support:
usairedadt@united-us.net" textAlignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="qjb-87-KPo">
+                                <rect key="frame" x="0.0" y="20" width="375" height="647"/>
                                 <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
                                 <fontDescription key="fontDescription" name="HelveticaNeue" family="Helvetica Neue" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
@@ -373,6 +393,12 @@
                             </textView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="qjb-87-KPo" firstAttribute="top" secondItem="qqy-e5-VYs" secondAttribute="top" id="4bi-eS-erf"/>
+                            <constraint firstItem="qjb-87-KPo" firstAttribute="leading" secondItem="qqy-e5-VYs" secondAttribute="leading" id="Ved-GU-IE4"/>
+                            <constraint firstItem="qqy-e5-VYs" firstAttribute="trailing" secondItem="qjb-87-KPo" secondAttribute="trailing" id="lzw-rT-OCd"/>
+                            <constraint firstItem="qqy-e5-VYs" firstAttribute="bottom" secondItem="qjb-87-KPo" secondAttribute="bottom" id="r4p-aI-pXH"/>
+                        </constraints>
                         <viewLayoutGuide key="safeArea" id="qqy-e5-VYs"/>
                     </view>
                     <navigationItem key="navigationItem" title="About" id="Fv2-lk-EA8"/>
@@ -383,7 +409,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="iQj-g2-Vsa" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2313" y="-1700"/>
+            <point key="canvasLocation" x="2312.8000000000002" y="-1700.5997001499252"/>
         </scene>
         <!--Service location-->
         <scene sceneID="Zcj-YW-YXI">
@@ -419,13 +445,15 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="apexlogo-2" translatesAutoresizingMaskIntoConstraints="NO" id="kly-ZP-lFy">
-                                <rect key="frame" x="0.0" y="55" width="320" height="56"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="apexlogo-2" translatesAutoresizingMaskIntoConstraints="NO" id="kly-ZP-lFy">
+                                <rect key="frame" x="0.0" y="20" width="320" height="56"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="320" id="4Rr-EF-U6t"/>
+                                    <constraint firstAttribute="height" constant="56" id="Dn7-V2-xCg"/>
+                                </constraints>
                             </imageView>
-                            <webView contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="Abt-ML-WTx">
-                                <rect key="frame" x="0.0" y="100" width="320" height="420"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Abt-ML-WTx">
+                                <rect key="frame" x="0.0" y="76" width="375" height="591"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <connections>
                                     <outlet property="delegate" destination="0gA-6x-keH" id="ck1-Fk-zK6"/>
@@ -433,6 +461,14 @@
                             </webView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="kly-ZP-lFy" firstAttribute="top" secondItem="qa6-ye-yCI" secondAttribute="bottom" id="2jQ-3a-dZP"/>
+                            <constraint firstItem="Abt-ML-WTx" firstAttribute="leading" secondItem="Ssf-nl-y6a" secondAttribute="leading" id="3y5-5b-L66"/>
+                            <constraint firstItem="NRY-LM-qAI" firstAttribute="top" secondItem="Abt-ML-WTx" secondAttribute="bottom" id="DBb-g4-j57"/>
+                            <constraint firstItem="Abt-ML-WTx" firstAttribute="top" secondItem="kly-ZP-lFy" secondAttribute="bottom" id="d8J-A7-Auz"/>
+                            <constraint firstAttribute="trailing" secondItem="Abt-ML-WTx" secondAttribute="trailing" id="eLo-Cl-6EL"/>
+                            <constraint firstItem="kly-ZP-lFy" firstAttribute="leading" secondItem="Ssf-nl-y6a" secondAttribute="leading" id="mhk-KJ-KLI"/>
+                        </constraints>
                     </view>
                     <connections>
                         <outlet property="webview" destination="Abt-ML-WTx" id="oxP-nO-FEd"/>
@@ -454,9 +490,8 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="65" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="RHV-m7-JCn">
+                            <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="65" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="RHV-m7-JCn">
                                 <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                                <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="newsitem" rowHeight="65" id="65E-n4-LH6" customClass="NewsTableViewCell">
@@ -466,25 +501,37 @@
                                             <rect key="frame" x="0.0" y="0.0" width="342" height="64.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="rect_market_news" translatesAutoresizingMaskIntoConstraints="NO" id="c0R-J8-9uA">
-                                                    <rect key="frame" x="5" y="0.0" width="120" height="65"/>
-                                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                                                </imageView>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bkc-WL-mze">
-                                                    <rect key="frame" x="78" y="0.0" width="42" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Bkc-WL-mze">
+                                                    <rect key="frame" x="79" y="0.0" width="258" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Label" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jq7-eQ-ZiX">
-                                                    <rect key="frame" x="78" y="20" width="209" height="44"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="Label" lineBreakMode="wordWrap" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jq7-eQ-ZiX">
+                                                    <rect key="frame" x="79" y="24" width="258" height="40"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <color key="textColor" red="0.33333334329999997" green="0.33333334329999997" blue="0.33333334329999997" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rect_market_news" translatesAutoresizingMaskIntoConstraints="NO" id="c0R-J8-9uA">
+                                                    <rect key="frame" x="10" y="0.0" width="64" height="64"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="64" id="6FD-Gf-avq"/>
+                                                        <constraint firstAttribute="height" constant="64" id="miM-A5-vlN"/>
+                                                    </constraints>
+                                                </imageView>
                                             </subviews>
+                                            <constraints>
+                                                <constraint firstItem="c0R-J8-9uA" firstAttribute="centerY" secondItem="SYB-mj-lbk" secondAttribute="centerY" id="2AZ-dy-hf5"/>
+                                                <constraint firstItem="jq7-eQ-ZiX" firstAttribute="top" secondItem="Bkc-WL-mze" secondAttribute="bottom" constant="3" id="6Bq-ZX-rzr"/>
+                                                <constraint firstItem="jq7-eQ-ZiX" firstAttribute="trailing" secondItem="Bkc-WL-mze" secondAttribute="trailing" id="Ink-95-9SF"/>
+                                                <constraint firstItem="Bkc-WL-mze" firstAttribute="top" secondItem="c0R-J8-9uA" secondAttribute="top" id="R2g-Ss-z53"/>
+                                                <constraint firstItem="jq7-eQ-ZiX" firstAttribute="bottom" secondItem="c0R-J8-9uA" secondAttribute="bottom" id="cC8-iu-0D3"/>
+                                                <constraint firstAttribute="trailing" secondItem="Bkc-WL-mze" secondAttribute="trailing" constant="5" id="cYd-Nu-RJX"/>
+                                                <constraint firstItem="c0R-J8-9uA" firstAttribute="leading" secondItem="SYB-mj-lbk" secondAttribute="leading" constant="10" id="cxA-B1-UcP"/>
+                                                <constraint firstItem="jq7-eQ-ZiX" firstAttribute="leading" secondItem="Bkc-WL-mze" secondAttribute="leading" id="hnL-vB-YNf"/>
+                                                <constraint firstItem="Bkc-WL-mze" firstAttribute="leading" secondItem="c0R-J8-9uA" secondAttribute="trailing" constant="5" id="mfM-j8-3GR"/>
+                                            </constraints>
                                         </tableViewCellContentView>
                                         <connections>
                                             <outlet property="content" destination="jq7-eQ-ZiX" id="M9b-JG-kvz"/>
@@ -499,13 +546,24 @@
                                     <outlet property="delegate" destination="EeD-fP-1oU" id="9cC-zc-64Z"/>
                                 </connections>
                             </tableView>
-                            <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="Kgw-c0-JVW">
-                                <rect key="frame" x="142" y="265" width="37" height="37"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="Kgw-c0-JVW">
+                                <rect key="frame" x="169" y="315" width="37" height="37"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="37" id="BfA-aP-CFD"/>
+                                    <constraint firstAttribute="height" constant="37" id="fGF-V4-WML"/>
+                                </constraints>
                                 <color key="color" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </activityIndicatorView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstAttribute="trailing" secondItem="RHV-m7-JCn" secondAttribute="trailing" id="3FN-UB-gQf"/>
+                            <constraint firstItem="Kgw-c0-JVW" firstAttribute="centerX" secondItem="RHV-m7-JCn" secondAttribute="centerX" id="Kbx-zg-bVy"/>
+                            <constraint firstItem="RHV-m7-JCn" firstAttribute="top" secondItem="uxr-eR-WO2" secondAttribute="top" id="Ki8-6B-1yl"/>
+                            <constraint firstItem="RHV-m7-JCn" firstAttribute="leading" secondItem="uxr-eR-WO2" secondAttribute="leading" id="deJ-X7-w6r"/>
+                            <constraint firstItem="Kgw-c0-JVW" firstAttribute="centerY" secondItem="RHV-m7-JCn" secondAttribute="centerY" id="p67-L8-zdC"/>
+                            <constraint firstItem="2sz-FS-Gr9" firstAttribute="top" secondItem="RHV-m7-JCn" secondAttribute="bottom" id="wd8-1o-5zj"/>
+                        </constraints>
                     </view>
                     <connections>
                         <outlet property="mum" destination="Kgw-c0-JVW" id="i34-3X-vc9"/>
@@ -514,7 +572,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="wl6-h0-nHg" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="4722" y="-1700"/>
+            <point key="canvasLocation" x="4720.8000000000002" y="-1700.5997001499252"/>
         </scene>
         <!--Search-->
         <scene sceneID="WqW-UO-y7w">
@@ -540,9 +598,11 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="81.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" restorationIdentifier="edit_from" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="From" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Fj7-9i-IJL">
-                                                    <rect key="frame" x="20" y="38" width="135" height="30"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="edit_from" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="From" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Fj7-9i-IJL">
+                                                    <rect key="frame" x="10" y="38" width="135" height="30"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="135" id="Sd3-n1-rl9"/>
+                                                    </constraints>
                                                     <nil key="textColor"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <textInputTraits key="textInputTraits" returnKeyType="done"/>
@@ -550,23 +610,33 @@
                                                         <outlet property="delegate" destination="C3t-ED-9dx" id="G84-PY-wEC"/>
                                                     </connections>
                                                 </textField>
-                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" restorationIdentifier="edit_to" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="To" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7An-ec-LnT">
-                                                    <rect key="frame" x="165" y="38" width="135" height="30"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" restorationIdentifier="edit_to" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="To" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7An-ec-LnT">
+                                                    <rect key="frame" x="230" y="38" width="135" height="30"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="135" id="9X7-Dw-ULj"/>
+                                                    </constraints>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <textInputTraits key="textInputTraits" returnKeyType="done"/>
                                                     <connections>
                                                         <outlet property="delegate" destination="C3t-ED-9dx" id="14m-Mm-aCu"/>
                                                     </connections>
                                                 </textField>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="item_date" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="siE-GW-KiJ">
-                                                    <rect key="frame" x="20" y="10" width="178" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="item_date" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="siE-GW-KiJ">
+                                                    <rect key="frame" x="10" y="10" width="355" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
+                                            <constraints>
+                                                <constraint firstItem="7An-ec-LnT" firstAttribute="trailing" secondItem="siE-GW-KiJ" secondAttribute="trailing" id="5Ge-LT-t6H"/>
+                                                <constraint firstItem="Fj7-9i-IJL" firstAttribute="leading" secondItem="siE-GW-KiJ" secondAttribute="leading" id="9az-Oe-oQf"/>
+                                                <constraint firstItem="7An-ec-LnT" firstAttribute="top" secondItem="Fj7-9i-IJL" secondAttribute="top" id="U3M-1c-R4O"/>
+                                                <constraint firstItem="Fj7-9i-IJL" firstAttribute="top" secondItem="siE-GW-KiJ" secondAttribute="bottom" constant="7" id="ZUx-VW-itB"/>
+                                                <constraint firstAttribute="trailing" secondItem="siE-GW-KiJ" secondAttribute="trailing" constant="10" id="d2q-Z5-RSD"/>
+                                                <constraint firstItem="siE-GW-KiJ" firstAttribute="top" secondItem="ExR-Af-j3g" secondAttribute="top" constant="10" id="phP-f4-ye1"/>
+                                                <constraint firstItem="siE-GW-KiJ" firstAttribute="leading" secondItem="ExR-Af-j3g" secondAttribute="leading" constant="10" id="weE-IR-Sth"/>
+                                            </constraints>
                                         </tableViewCellContentView>
                                         <connections>
                                             <outlet property="anameLabel" destination="siE-GW-KiJ" id="AT9-Lm-1y4"/>
@@ -581,16 +651,14 @@
                                             <rect key="frame" x="0.0" y="0.0" width="342" height="81.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="item_bool" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="94I-uG-uW7">
-                                                    <rect key="frame" x="20" y="10" width="143" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="item_bool" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="94I-uG-uW7">
+                                                    <rect key="frame" x="10" y="10" width="322" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XF6-7j-X0s">
-                                                    <rect key="frame" x="0.0" y="10" width="320" height="71"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XF6-7j-X0s">
+                                                    <rect key="frame" x="10" y="0.0" width="322" height="81"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <state key="normal" title="Not set">
                                                         <color key="titleColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -601,6 +669,15 @@
                                                     </connections>
                                                 </button>
                                             </subviews>
+                                            <constraints>
+                                                <constraint firstItem="94I-uG-uW7" firstAttribute="top" secondItem="78g-DF-IJU" secondAttribute="top" constant="10" id="IPp-q2-DX4"/>
+                                                <constraint firstItem="XF6-7j-X0s" firstAttribute="height" secondItem="78g-DF-IJU" secondAttribute="height" id="OqZ-Qf-1oI"/>
+                                                <constraint firstItem="94I-uG-uW7" firstAttribute="leading" secondItem="78g-DF-IJU" secondAttribute="leading" constant="10" id="SdZ-5q-jYu"/>
+                                                <constraint firstItem="XF6-7j-X0s" firstAttribute="leading" secondItem="94I-uG-uW7" secondAttribute="leading" id="e8B-5T-2gZ"/>
+                                                <constraint firstItem="XF6-7j-X0s" firstAttribute="trailing" secondItem="94I-uG-uW7" secondAttribute="trailing" id="nIa-8R-wVM"/>
+                                                <constraint firstItem="XF6-7j-X0s" firstAttribute="centerY" secondItem="78g-DF-IJU" secondAttribute="centerY" id="pbP-Bm-Ont"/>
+                                                <constraint firstAttribute="trailing" secondItem="94I-uG-uW7" secondAttribute="trailing" constant="10" id="qHe-Io-NKd"/>
+                                            </constraints>
                                         </tableViewCellContentView>
                                         <connections>
                                             <outlet property="anameLabel" destination="94I-uG-uW7" id="RfC-Vi-cgU"/>
@@ -614,16 +691,14 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="81.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="item_edit" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5yL-Qn-keV">
-                                                    <rect key="frame" x="20" y="10" width="156" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="item_edit" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5yL-Qn-keV">
+                                                    <rect key="frame" x="10" y="10" width="355" height="21"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter criterion" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="3xs-xH-AbW">
-                                                    <rect key="frame" x="20" y="38" width="280" height="30"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                                <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter criterion" minimumFontSize="17" clearButtonMode="always" translatesAutoresizingMaskIntoConstraints="NO" id="3xs-xH-AbW">
+                                                    <rect key="frame" x="10" y="38" width="355" height="30"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <textInputTraits key="textInputTraits" returnKeyType="done"/>
                                                     <connections>
@@ -631,6 +706,14 @@
                                                     </connections>
                                                 </textField>
                                             </subviews>
+                                            <constraints>
+                                                <constraint firstItem="3xs-xH-AbW" firstAttribute="leading" secondItem="5yL-Qn-keV" secondAttribute="leading" id="4ct-qr-Lp4"/>
+                                                <constraint firstAttribute="trailing" secondItem="5yL-Qn-keV" secondAttribute="trailing" constant="10" id="PiO-hc-PKU"/>
+                                                <constraint firstItem="5yL-Qn-keV" firstAttribute="leading" secondItem="3St-ZX-jbo" secondAttribute="leading" constant="10" id="Y5W-kP-aD1"/>
+                                                <constraint firstItem="3xs-xH-AbW" firstAttribute="trailing" secondItem="5yL-Qn-keV" secondAttribute="trailing" id="buN-TR-94b"/>
+                                                <constraint firstItem="3xs-xH-AbW" firstAttribute="top" secondItem="5yL-Qn-keV" secondAttribute="bottom" constant="7" id="esc-7s-P2W"/>
+                                                <constraint firstItem="5yL-Qn-keV" firstAttribute="top" secondItem="3St-ZX-jbo" secondAttribute="top" constant="10" id="gjE-wq-HDc"/>
+                                            </constraints>
                                         </tableViewCellContentView>
                                         <connections>
                                             <outlet property="anameLabel" destination="5yL-Qn-keV" id="NTx-6M-V9t"/>
@@ -649,7 +732,7 @@
                                 <items>
                                     <barButtonItem style="plain" id="bX6-SA-fCQ">
                                         <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="q98-Ul-Lg7">
-                                            <rect key="frame" x="16" y="5.5" width="73" height="33"/>
+                                            <rect key="frame" x="16" y="7" width="36" height="30"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <state key="normal" title="Clear">
                                                 <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -662,7 +745,7 @@
                                     <barButtonItem systemItem="flexibleSpace" id="DPL-8Q-HwA"/>
                                     <barButtonItem style="plain" id="VRS-1z-M9u">
                                         <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="azJ-db-8ce">
-                                            <rect key="frame" x="286" y="5.5" width="73" height="33"/>
+                                            <rect key="frame" x="311" y="7" width="48" height="30"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <state key="normal" title="Search">
                                                 <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -690,7 +773,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="erf-Re-vM1" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2313" y="-1021"/>
+            <point key="canvasLocation" x="2312.8000000000002" y="-1021.4392803598201"/>
         </scene>
         <!--Result-->
         <scene sceneID="J6y-Nq-tW6">
@@ -868,20 +951,36 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="64.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uow-re-de3">
-                                                    <rect key="frame" x="20" y="7" width="43" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uow-re-de3">
+                                                    <rect key="frame" x="85" y="5" width="280" height="21"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="time" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RJz-KQ-Fv2">
-                                                    <rect key="frame" x="220" y="29" width="135" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                                <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rect_announcements" translatesAutoresizingMaskIntoConstraints="NO" id="1xj-Cr-Ecf">
+                                                    <rect key="frame" x="10" y="0.0" width="65" height="65"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="height" constant="65" id="Edc-JY-dE4"/>
+                                                        <constraint firstAttribute="width" constant="65" id="jtA-MQ-fDI"/>
+                                                    </constraints>
+                                                </imageView>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="time" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="RJz-KQ-Fv2">
+                                                    <rect key="frame" x="85" y="36" width="280" height="17"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                             </subviews>
+                                            <constraints>
+                                                <constraint firstItem="1xj-Cr-Ecf" firstAttribute="centerY" secondItem="Hb4-Tl-jhw" secondAttribute="centerY" id="2Ro-CS-Eyh"/>
+                                                <constraint firstItem="RJz-KQ-Fv2" firstAttribute="top" secondItem="Uow-re-de3" secondAttribute="bottom" constant="10" id="OKL-09-fZI"/>
+                                                <constraint firstItem="RJz-KQ-Fv2" firstAttribute="leading" secondItem="Uow-re-de3" secondAttribute="leading" id="VVM-Tl-19g"/>
+                                                <constraint firstItem="1xj-Cr-Ecf" firstAttribute="leading" secondItem="Hb4-Tl-jhw" secondAttribute="leading" constant="10" id="iwV-Mm-NkW"/>
+                                                <constraint firstItem="Uow-re-de3" firstAttribute="top" secondItem="Hb4-Tl-jhw" secondAttribute="top" constant="5" id="j0n-XV-nIo"/>
+                                                <constraint firstAttribute="trailing" secondItem="Uow-re-de3" secondAttribute="trailing" constant="10" id="nsP-vQ-qVL"/>
+                                                <constraint firstItem="RJz-KQ-Fv2" firstAttribute="trailing" secondItem="Uow-re-de3" secondAttribute="trailing" id="qnC-HH-PU9"/>
+                                                <constraint firstItem="Uow-re-de3" firstAttribute="leading" secondItem="1xj-Cr-Ecf" secondAttribute="trailing" constant="10" id="xf2-uN-KPd"/>
+                                            </constraints>
                                         </tableViewCellContentView>
                                         <connections>
                                             <outlet property="name" destination="Uow-re-de3" id="rUz-qL-lle"/>
@@ -926,20 +1025,36 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="64.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tp8-Ek-fGC">
-                                                    <rect key="frame" x="20" y="7" width="43" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tp8-Ek-fGC">
+                                                    <rect key="frame" x="85" y="5" width="280" height="21"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="18"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="time" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nzO-0Q-mKW">
-                                                    <rect key="frame" x="220" y="29" width="135" height="21"/>
-                                                    <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                                                <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="time" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nzO-0Q-mKW">
+                                                    <rect key="frame" x="85" y="36" width="280" height="17"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                    <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
+                                                <imageView contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rect_announcements" translatesAutoresizingMaskIntoConstraints="NO" id="UI6-iv-41o">
+                                                    <rect key="frame" x="10" y="-1" width="65" height="65"/>
+                                                    <constraints>
+                                                        <constraint firstAttribute="width" constant="65" id="Yx6-AT-Mbf"/>
+                                                        <constraint firstAttribute="height" constant="65" id="fBz-G8-b1l"/>
+                                                    </constraints>
+                                                </imageView>
                                             </subviews>
+                                            <constraints>
+                                                <constraint firstItem="UI6-iv-41o" firstAttribute="centerY" secondItem="8TO-KO-16G" secondAttribute="centerY" id="Bam-ej-9IA"/>
+                                                <constraint firstItem="nzO-0Q-mKW" firstAttribute="top" secondItem="tp8-Ek-fGC" secondAttribute="bottom" constant="10" id="EbR-hd-cHC"/>
+                                                <constraint firstItem="UI6-iv-41o" firstAttribute="leading" secondItem="8TO-KO-16G" secondAttribute="leading" constant="10" id="Isc-uh-vvM"/>
+                                                <constraint firstItem="tp8-Ek-fGC" firstAttribute="leading" secondItem="UI6-iv-41o" secondAttribute="trailing" constant="10" id="UgC-Zr-bXT"/>
+                                                <constraint firstItem="tp8-Ek-fGC" firstAttribute="top" secondItem="8TO-KO-16G" secondAttribute="top" constant="5" id="Ukj-RK-sy1"/>
+                                                <constraint firstItem="nzO-0Q-mKW" firstAttribute="trailing" secondItem="tp8-Ek-fGC" secondAttribute="trailing" id="c9X-SM-gRV"/>
+                                                <constraint firstItem="nzO-0Q-mKW" firstAttribute="leading" secondItem="tp8-Ek-fGC" secondAttribute="leading" id="jh6-cK-mIW"/>
+                                                <constraint firstAttribute="trailing" secondItem="tp8-Ek-fGC" secondAttribute="trailing" constant="10" id="ssS-FJ-2sF"/>
+                                            </constraints>
                                         </tableViewCellContentView>
                                         <connections>
                                             <outlet property="name" destination="tp8-Ek-fGC" id="G4w-eU-Poj"/>
@@ -1031,9 +1146,11 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Old password *required" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="XR8-ML-teu">
-                                <rect key="frame" x="21" y="77" width="280" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Old password *required" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="XR8-ML-teu">
+                                <rect key="frame" x="10" y="30" width="355" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="wVN-P8-uR2"/>
+                                </constraints>
                                 <inset key="insetFor6xAndEarlier" minX="0.0" minY="60" maxX="0.0" maxY="-60"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
@@ -1041,19 +1158,11 @@
                                     <outlet property="delegate" destination="adW-Ar-52t" id="8j3-wI-PrU"/>
                                 </connections>
                             </textField>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="New password *required" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oiA-1a-FH6">
-                                <rect key="frame" x="21" y="115" width="280" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <inset key="insetFor6xAndEarlier" minX="0.0" minY="60" maxX="0.0" maxY="-60"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
-                                <connections>
-                                    <outlet property="delegate" destination="adW-Ar-52t" id="6Ug-bV-qAI"/>
-                                </connections>
-                            </textField>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Confirm new password *required" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="x3N-fn-QfS">
-                                <rect key="frame" x="21" y="153" width="280" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Confirm new password *required" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="x3N-fn-QfS">
+                                <rect key="frame" x="10" y="110" width="355" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="xoj-pD-tGz"/>
+                                </constraints>
                                 <inset key="insetFor6xAndEarlier" minX="0.0" minY="60" maxX="0.0" maxY="-60"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
@@ -1061,9 +1170,11 @@
                                     <outlet property="delegate" destination="adW-Ar-52t" id="Fhr-0F-cwc"/>
                                 </connections>
                             </textField>
-                            <button hidden="YES" opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gUy-8S-kFU">
-                                <rect key="frame" x="21" y="272" width="48" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gUy-8S-kFU">
+                                <rect key="frame" x="10" y="150" width="48" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="d1t-tg-Ktk"/>
+                                </constraints>
                                 <state key="normal" title="Cancel">
                                     <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
@@ -1071,9 +1182,11 @@
                                     <action selector="onCancel:" destination="adW-Ar-52t" eventType="touchUpInside" id="bo5-sE-1dQ"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EZm-dC-lQ4">
-                                <rect key="frame" x="302" y="191" width="54" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EZm-dC-lQ4">
+                                <rect key="frame" x="312" y="150" width="53" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="xac-v9-MaN"/>
+                                </constraints>
                                 <inset key="insetFor6xAndEarlier" minX="0.0" minY="60" maxX="0.0" maxY="-60"/>
                                 <state key="normal" title="Change">
                                     <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -1082,14 +1195,43 @@
                                     <action selector="onChange:" destination="adW-Ar-52t" eventType="touchUpInside" id="Dd1-AG-iYq"/>
                                 </connections>
                             </button>
-                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="hjm-ij-Anz">
-                                <rect key="frame" x="142" y="266" width="37" height="37"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="hjm-ij-Anz">
+                                <rect key="frame" x="169" y="315" width="37" height="37"/>
                                 <inset key="insetFor6xAndEarlier" minX="0.0" minY="60" maxX="0.0" maxY="-60"/>
                                 <color key="color" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </activityIndicatorView>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="New password *required" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oiA-1a-FH6">
+                                <rect key="frame" x="10" y="70" width="355" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="vO4-mR-qW6"/>
+                                </constraints>
+                                <inset key="insetFor6xAndEarlier" minX="0.0" minY="60" maxX="0.0" maxY="-60"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <textInputTraits key="textInputTraits" returnKeyType="done" secureTextEntry="YES"/>
+                                <connections>
+                                    <outlet property="delegate" destination="adW-Ar-52t" id="6Ug-bV-qAI"/>
+                                </connections>
+                            </textField>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="hjm-ij-Anz" firstAttribute="centerX" secondItem="XVG-tV-s5j" secondAttribute="centerX" id="0uO-1D-HzA"/>
+                            <constraint firstItem="oiA-1a-FH6" firstAttribute="top" secondItem="XR8-ML-teu" secondAttribute="bottom" constant="10" id="2Oo-lE-Hhs"/>
+                            <constraint firstItem="XR8-ML-teu" firstAttribute="top" secondItem="OyU-Fh-lP6" secondAttribute="bottom" constant="10" id="4Q2-MN-3ac"/>
+                            <constraint firstItem="x3N-fn-QfS" firstAttribute="leading" secondItem="XVG-tV-s5j" secondAttribute="leading" constant="10" id="5tL-pk-yjl"/>
+                            <constraint firstItem="gUy-8S-kFU" firstAttribute="top" secondItem="x3N-fn-QfS" secondAttribute="bottom" constant="10" id="6AN-V9-vaL"/>
+                            <constraint firstAttribute="trailing" secondItem="oiA-1a-FH6" secondAttribute="trailing" constant="10" id="FI9-Vp-7WP"/>
+                            <constraint firstAttribute="trailing" secondItem="EZm-dC-lQ4" secondAttribute="trailing" constant="10" id="KHR-BX-pW5"/>
+                            <constraint firstAttribute="trailing" secondItem="XR8-ML-teu" secondAttribute="trailing" constant="10" id="Khm-cU-not"/>
+                            <constraint firstItem="x3N-fn-QfS" firstAttribute="top" secondItem="oiA-1a-FH6" secondAttribute="bottom" constant="10" id="N0D-Zd-9MY"/>
+                            <constraint firstItem="XR8-ML-teu" firstAttribute="leading" secondItem="XVG-tV-s5j" secondAttribute="leading" constant="10" id="RDI-8M-ThR"/>
+                            <constraint firstItem="XR8-ML-teu" firstAttribute="centerX" secondItem="XVG-tV-s5j" secondAttribute="centerX" id="WVK-cF-BMx"/>
+                            <constraint firstItem="gUy-8S-kFU" firstAttribute="leading" secondItem="XVG-tV-s5j" secondAttribute="leading" constant="10" id="b9P-vC-UCJ"/>
+                            <constraint firstItem="EZm-dC-lQ4" firstAttribute="top" secondItem="x3N-fn-QfS" secondAttribute="bottom" constant="10" id="ocR-Sk-Gcs"/>
+                            <constraint firstItem="hjm-ij-Anz" firstAttribute="centerY" secondItem="XVG-tV-s5j" secondAttribute="centerY" id="qmb-OQ-WQ7"/>
+                            <constraint firstItem="oiA-1a-FH6" firstAttribute="leading" secondItem="XVG-tV-s5j" secondAttribute="leading" constant="10" id="s6Y-kA-8ty"/>
+                            <constraint firstAttribute="trailing" secondItem="x3N-fn-QfS" secondAttribute="trailing" constant="10" id="yHp-2A-Ob7"/>
+                        </constraints>
                     </view>
                     <navigationItem key="navigationItem" title="Change password" id="1o1-l5-SjW"/>
                     <connections>
@@ -1129,7 +1271,7 @@
                                             <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="Title" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="4Dk-AL-yOW">
+                                                <label opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="left" text="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="4Dk-AL-yOW">
                                                     <rect key="frame" x="15" y="0.0" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="18"/>
@@ -1176,27 +1318,32 @@
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="User name" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rNA-kt-gF6">
-                                <rect key="frame" x="20" y="49" width="280" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="User name" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rNA-kt-gF6">
+                                <rect key="frame" x="47.5" y="53" width="280" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="280" id="VTi-sA-ndN"/>
+                                    <constraint firstAttribute="height" constant="30" id="gwM-Ix-uwv"/>
+                                </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" returnKeyType="done"/>
                                 <connections>
                                     <outlet property="delegate" destination="6Nv-Co-XiD" id="2nk-dw-UF0"/>
                                 </connections>
                             </textField>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Email" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="zBl-3h-h8W">
-                                <rect key="frame" x="20" y="87" width="280" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Email" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="zBl-3h-h8W">
+                                <rect key="frame" x="47.5" y="88" width="280" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="xOt-sd-Dhl"/>
+                                    <constraint firstAttribute="width" constant="280" id="zcB-7b-J36"/>
+                                </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                 <textInputTraits key="textInputTraits" returnKeyType="done"/>
                                 <connections>
                                     <outlet property="delegate" destination="6Nv-Co-XiD" id="VXG-xf-Amb"/>
                                 </connections>
                             </textField>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gha-2I-ENG">
-                                <rect key="frame" x="20" y="125" width="48" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gha-2I-ENG">
+                                <rect key="frame" x="47" y="128" width="48" height="30"/>
                                 <state key="normal" title="Cancel">
                                     <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
@@ -1204,9 +1351,8 @@
                                     <action selector="OnCancel:" destination="6Nv-Co-XiD" eventType="touchUpInside" id="1qN-la-b9K"/>
                                 </connections>
                             </button>
-                            <button opaque="NO" contentMode="scaleToFill" fixedFrame="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oJM-ge-k0D">
-                                <rect key="frame" x="325" y="125" width="30" height="30"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxY="YES"/>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oJM-ge-k0D">
+                                <rect key="frame" x="297" y="128" width="30" height="30"/>
                                 <state key="normal" title="Ok">
                                     <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 </state>
@@ -1214,19 +1360,31 @@
                                     <action selector="OnOk:" destination="6Nv-Co-XiD" eventType="touchUpInside" id="Hqr-qq-s3l"/>
                                 </connections>
                             </button>
-                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="Fkr-8L-6gA">
-                                <rect key="frame" x="142" y="142" width="37" height="37"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <color key="color" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                            </activityIndicatorView>
-                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="Retrieve password" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MGf-17-Sft">
-                                <rect key="frame" x="89" y="20" width="143" height="21"/>
-                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                            <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Retrieve Password" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="MGf-17-Sft">
+                                <rect key="frame" x="109.5" y="25" width="156.5" height="23"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="19"/>
                                 <nil key="highlightedColor"/>
                             </label>
+                            <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="Fkr-8L-6gA">
+                                <rect key="frame" x="169" y="315" width="37" height="37"/>
+                                <color key="color" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                            </activityIndicatorView>
                         </subviews>
                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                        <constraints>
+                            <constraint firstItem="Fkr-8L-6gA" firstAttribute="centerX" secondItem="qVj-DC-yAZ" secondAttribute="centerX" id="0h5-Yw-yY7"/>
+                            <constraint firstItem="zBl-3h-h8W" firstAttribute="top" secondItem="rNA-kt-gF6" secondAttribute="bottom" constant="5" id="7vK-Md-xOG"/>
+                            <constraint firstItem="MGf-17-Sft" firstAttribute="centerX" secondItem="qVj-DC-yAZ" secondAttribute="centerX" id="BBL-be-tp9"/>
+                            <constraint firstItem="gha-2I-ENG" firstAttribute="leading" secondItem="zBl-3h-h8W" secondAttribute="leading" id="CJo-pS-gaC"/>
+                            <constraint firstItem="oJM-ge-k0D" firstAttribute="top" secondItem="gha-2I-ENG" secondAttribute="top" id="ILm-RJ-XGI"/>
+                            <constraint firstItem="rNA-kt-gF6" firstAttribute="centerX" secondItem="qVj-DC-yAZ" secondAttribute="centerX" id="Pc3-eZ-Bya"/>
+                            <constraint firstItem="MGf-17-Sft" firstAttribute="top" secondItem="JWm-DZ-V4Z" secondAttribute="bottom" constant="5" id="RzJ-xG-kNt"/>
+                            <constraint firstItem="oJM-ge-k0D" firstAttribute="trailing" secondItem="zBl-3h-h8W" secondAttribute="trailing" id="W9p-7E-uZa"/>
+                            <constraint firstItem="rNA-kt-gF6" firstAttribute="top" secondItem="MGf-17-Sft" secondAttribute="bottom" constant="5" id="Ye6-yP-FIe"/>
+                            <constraint firstItem="zBl-3h-h8W" firstAttribute="centerX" secondItem="qVj-DC-yAZ" secondAttribute="centerX" id="fuP-XJ-SfK"/>
+                            <constraint firstItem="Fkr-8L-6gA" firstAttribute="centerY" secondItem="qVj-DC-yAZ" secondAttribute="centerY" id="gpQ-h6-eoY"/>
+                            <constraint firstItem="gha-2I-ENG" firstAttribute="top" secondItem="zBl-3h-h8W" secondAttribute="bottom" constant="10" id="uac-jg-ZvV"/>
+                        </constraints>
                     </view>
                     <navigationItem key="navigationItem" id="Tsm-IG-Abp"/>
                     <connections>
@@ -1239,7 +1397,7 @@
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="Xk3-ZB-I0m" userLabel="First Responder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="2313" y="-2448"/>
+            <point key="canvasLocation" x="2312.8000000000002" y="-2448.1259370314842"/>
         </scene>
         <!--News Detail View Controller-->
         <scene sceneID="PFT-QF-clX">
@@ -1278,6 +1436,7 @@
         <image name="apexlogo-2" width="129" height="32"/>
         <image name="ic_pdf128" width="64" height="64"/>
         <image name="map (1)" width="32" height="32"/>
+        <image name="rect_announcements" width="64" height="64"/>
         <image name="rect_market_news" width="64" height="64"/>
         <image name="tab_history" width="30" height="30"/>
         <image name="tab_home" width="30" height="30"/>

Apex Mobile/Apex Mobile/MylistViewController.m

@@ -113,7 +113,13 @@
 
         ChangePasswordViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"ChangePassword"];
         //        newsview.module_name = @"Market news";
-        [self.navigationController pushViewController:viewcontroller animated:YES];
+        
+        viewcontroller.preferredContentSize = CGSizeMake(350, 170);
+        
+//        [self.navigationController pushViewController:viewcontroller animated:YES];
+        
+        [self presentViewController:viewcontroller animated:YES completion:nil];
+        
     }
     else if([type isEqualToString:@"logout"])
     {

Apex Mobile/Apex Mobile/OrderHistoryViewController.m

@@ -10,6 +10,8 @@
 #import "ShipingStatusCell.h"
 #import "JLRefreshHeader.h"
 #import "JLRefreshFooter.h"
+#import "ApexMobileDB.h"
+#import "DetailTabBarController.h"
 
 #define HISTORY_SHIP_CELL_IDENTIFIER @"HistoryShippingStatusCell"
 static const int delta = 7;
@@ -221,6 +223,37 @@ static const int delta = 7;
     return 110;
 }
 
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
+    
+    [params setObject:@"dumb" forKey:@"id"];
+    NSString* h_field;
+    //if(self.radioContainer.selected==true)
+    //{
+    //    [params setObject:@"1" forKey:@"criterion_type"];
+    //    h_field = @"ctnr";
+    //}
+    //else
+    {
+        [params setObject:@"0" forKey:@"criterion_type"];
+        h_field = @"h_bol";
+    }
+    
+    NSDictionary *item = [self.shipArray objectAtIndex:indexPath.section];
+    NSString * cargo_criterion = item[@"hbol"];
+    if(cargo_criterion==nil)
+        cargo_criterion=@"";
+    [params setObject:cargo_criterion forKey:@"cargo_criterion"];
+    
+    
+    [ApexMobileDB savehistory:h_field value:cargo_criterion];
+    
+    DetailTabBarController *detailViewController=[[DetailTabBarController alloc] init:@"Cargo Tracking" actions:[NSArray arrayWithObjects:@"Tracking",nil] params:params];
+    [self.navigationController pushViewController:detailViewController animated:YES];
+    
+}
+
 #pragma mark - RefreshDelegate
 
 - (void)jl_beginRefresh:(JLRefreshBasis *)refresh {

Apex Mobile/Apex Mobile/RetrievePasswordViewController.h

@@ -8,9 +8,10 @@
 
 #import <UIKit/UIKit.h>
 #import "RANetwork.h"
+#import "JLCustomerAlertController.h"
 
 
-@interface RetrievePasswordViewController : UIViewController<UITextFieldDelegate>
+@interface RetrievePasswordViewController : JLCustomerAlertController<UITextFieldDelegate>
 @property (strong, nonatomic) IBOutlet UITextField *editUser;
 @property (strong, nonatomic) IBOutlet UITextField *editEmail;
 @property (strong, nonatomic) IBOutlet UIActivityIndicatorView *mum;

Apex Mobile/Apex Mobile/SearchViewController.m

@@ -474,21 +474,78 @@
     if(![[field valueForKey:@"type"] isEqualToString:@"time"])
         return YES;
     
-    NSString *title = UIDeviceOrientationIsLandscape([UIDevice currentDevice].orientation) ? @"\n\n\n\n\n\n\n\n\n" : @"\n\n\n\n\n\n\n\n\n\n\n\n";
-    UIActionSheet *dateDialog = [[UIActionSheet alloc] initWithTitle:title
-                                                            delegate:self
-                                                   cancelButtonTitle:NSLocalizedString(@"cancel",nil)
-                                              destructiveButtonTitle:NSLocalizedString(@"clear",nil)
-                                                   otherButtonTitles:NSLocalizedString(@"set",nil),
-                                 nil];
-    dateDialog.tag = 0;
-    //dateDialog.actionSheetStyle = self.navigationController.navigationBar.barStyle;
-    [dateDialog showInView:self.view];
     UIDatePicker *datePicker = [[UIDatePicker alloc] init];
     datePicker.tag = 101;
     datePicker.datePickerMode=UIDatePickerModeDate;
-    [dateDialog addSubview:datePicker];
     
+    NSString *title = UIDeviceOrientationIsLandscape([UIDevice currentDevice].orientation) ? @"\n\n\n\n\n\n\n\n\n" : @"\n\n\n\n\n\n\n\n\n\n\n\n";
+//    UIActionSheet *dateDialog = [[UIActionSheet alloc] initWithTitle:title
+//                                                            delegate:self
+//                                                   cancelButtonTitle:NSLocalizedString(@"cancel",nil)
+//                                              destructiveButtonTitle:NSLocalizedString(@"clear",nil)
+//                                                   otherButtonTitles:NSLocalizedString(@"set",nil),
+//                                 nil];
+//    dateDialog.tag = 0;
+//    //dateDialog.actionSheetStyle = self.navigationController.navigationBar.barStyle;
+//    [dateDialog showInView:self.view];
+//    [dateDialog addSubview:datePicker];
+    
+    __weak typeof(self) weakSelf = self;
+    UIAlertController *alertVC = [UIAlertController alertControllerWithTitle:title message:nil preferredStyle:UIAlertControllerStyleActionSheet];
+    UIAlertAction *setAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"set",nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        
+        NSDate *date = [datePicker date];
+        NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init];
+        //设定时间格式,这里可以设置成自己需要的格式
+        [dateFormatter setDateFormat:@"MM/dd/yyyy"];
+        //用[NSDate date]可以获取系统当前时间
+        self.textFieldtmp.text = [dateFormatter stringFromDate:date];
+
+        UITableViewCell *cell  = (UITableViewCell *)[[weakSelf.textFieldtmp superview] superview];
+
+        
+        NSIndexPath *indexPath = [weakSelf.table indexPathForCell:cell];
+        if(indexPath==nil)
+        {//for ios7
+            cell  = (UITableViewCell *) weakSelf.textFieldtmp.superview.superview.superview;
+            indexPath = [weakSelf.table indexPathForCell:cell];
+        }
+        
+        if([weakSelf.textFieldtmp.restorationIdentifier isEqualToString:@"edit_from"])
+            [[_adapter get_item:[indexPath row]] setValue:[dateFormatter stringFromDate:date] forKey:@"from"];
+        else
+            [[_adapter get_item:[indexPath row]] setValue:[dateFormatter stringFromDate:date] forKey:@"to"];
+
+        
+    }];
+    UIAlertAction *clearAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"clear",nil) style:UIAlertActionStyleDefault handler:^(UIAlertAction * _Nonnull action) {
+        
+        weakSelf.textFieldtmp.text=nil;
+        UITableViewCell *cell  = (UITableViewCell *)[[weakSelf.textFieldtmp superview] superview];
+        
+        NSIndexPath *indexPath = [weakSelf.table indexPathForCell:cell];
+        if(indexPath==nil)
+        {//for ios7
+            cell  = (UITableViewCell *) weakSelf.textFieldtmp.superview.superview.superview;
+            indexPath = [weakSelf.table indexPathForCell:cell];
+        }
+        
+        if([self.textFieldtmp.restorationIdentifier isEqualToString:@"edit_from"])
+            [[_adapter get_item:[indexPath row]] setValue:@"" forKey:@"from"];
+        else
+            [[_adapter get_item:[indexPath row]] setValue:@"" forKey:@"to"];
+    }];
+
+    UIAlertAction *cancelAction = [UIAlertAction actionWithTitle:NSLocalizedString(@"cancel",nil) style:UIAlertActionStyleDestructive handler:^(UIAlertAction * _Nonnull action) {
+        
+    }];
+
+
+    [alertVC.view addSubview:datePicker];
+    [alertVC addAction:setAction];
+    [alertVC addAction:clearAction];
+    [alertVC addAction:cancelAction];
+    [self presentViewController:alertVC animated:YES completion:nil];
     
     //    NSIndexPath *indexPath = [self.table indexPathForCell:cell];
 	// 此处编写弹出日期选择器的代码。

Apex Mobile/Apex Mobile/ShipSearchController.m

@@ -8,6 +8,8 @@
 
 #import "ShipSearchController.h"
 #import "ShipingStatusCell.h"
+#import "ApexMobileDB.h"
+#import "DetailTabBarController.h"
 
 #define SEARCH_CELL_IDENTIFIER @"SearchShippingStatusCell"
 
@@ -58,14 +60,14 @@
 }
 
 - (void)loadData {
-    NSString *path = [[NSBundle mainBundle] pathForResource:@"fake_container_list.json" ofType:nil];
-    NSData *data = [[NSData alloc] initWithContentsOfFile:path];
-    
-    NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:nil];
-    [self.shipArray removeAllObjects];
-    [self.shipArray addObjectsFromArray:[json objectForKey:@"container_list"]];
-    
-    [self.searchTable reloadData];
+//    NSString *path = [[NSBundle mainBundle] pathForResource:@"fake_container_list.json" ofType:nil];
+//    NSData *data = [[NSData alloc] initWithContentsOfFile:path];
+//
+//    NSDictionary *json = [NSJSONSerialization JSONObjectWithData:data options:NSJSONReadingMutableLeaves error:nil];
+//    [self.shipArray removeAllObjects];
+//    [self.shipArray addObjectsFromArray:[json objectForKey:@"container_list"]];
+//
+//    [self.searchTable reloadData];
 }
 
 #pragma mark - Private
@@ -160,6 +162,37 @@
     return 110;
 }
 
+- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath {
+    
+    NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
+    
+    [params setObject:@"dumb" forKey:@"id"];
+    NSString* h_field;
+    //if(self.radioContainer.selected==true)
+    //{
+    //    [params setObject:@"1" forKey:@"criterion_type"];
+    //    h_field = @"ctnr";
+    //}
+    //else
+    {
+        [params setObject:@"0" forKey:@"criterion_type"];
+        h_field = @"h_bol";
+    }
+    
+    NSDictionary *item = [self.shipArray objectAtIndex:indexPath.section];
+    NSString * cargo_criterion = item[@"hbol"];
+    if(cargo_criterion==nil)
+        cargo_criterion=@"";
+    [params setObject:cargo_criterion forKey:@"cargo_criterion"];
+    
+    
+    [ApexMobileDB savehistory:h_field value:cargo_criterion];
+    
+    DetailTabBarController *detailViewController=[[DetailTabBarController alloc] init:@"Cargo Tracking" actions:[NSArray arrayWithObjects:@"Tracking",nil] params:params];
+    [self.navigationController pushViewController:detailViewController animated:YES];
+    
+}
+
 #pragma mark - SearchBar Delegate
 
 - (BOOL)searchBarShouldBeginEditing:(UISearchBar *)searchBar {
@@ -170,33 +203,33 @@
 - (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar {
     [self loadData];
     
+    NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
+
+    [params setObject:@"dumb" forKey:@"id"];
+    NSString* h_field;
     
-    /*
-     NSMutableDictionary *params = [[NSMutableDictionary alloc] init];
-     
-     [params setObject:@"dumb" forKey:@"id"];
-     NSString* h_field;
-     if(self.radioContainer.selected==true)
-     {
-     [params setObject:@"1" forKey:@"criterion_type"];
-     h_field = @"ctnr";
-     }
-     else
-     {
-     [params setObject:@"0" forKey:@"criterion_type"];
-     h_field = @"h_bol";
-     }
-     NSString * cargo_criterion = self.edit.text;
-     if(cargo_criterion==nil)
-     cargo_criterion=@"";
-     [params setObject:cargo_criterion forKey:@"cargo_criterion"];
-     
-     
-     [ApexMobileDB savehistory:h_field value:cargo_criterion];
+    if(self.currentMode == 1)
+    {
+        [params setObject:@"1" forKey:@"criterion_type"];
+        h_field = @"ctnr";
+    }
+    else
+    {
+        [params setObject:@"0" forKey:@"criterion_type"];
+        h_field = @"h_bol";
+    }
+    
+    NSString * cargo_criterion = searchBar.text;
+    if(cargo_criterion==nil)
+    cargo_criterion=@"";
+    [params setObject:cargo_criterion forKey:@"cargo_criterion"];
+
+
+    [ApexMobileDB savehistory:h_field value:cargo_criterion];
+
+    DetailTabBarController *detailViewController=[[DetailTabBarController alloc] init:@"Cargo Tracking" actions:[NSArray arrayWithObjects:@"Tracking",nil] params:params];
+    [self.navigationController pushViewController:detailViewController animated:YES];
      
-     DetailTabBarController *detailViewController=[[DetailTabBarController alloc] init:@"Cargo Tracking" actions:[NSArray arrayWithObjects:@"Tracking",nil] params:params];
-     [self.navigationController pushViewController:detailViewController animated:YES];
-     */
 }
 
 - (void)searchBarCancelButtonClicked:(UISearchBar *)searchBar {