1.调整Apex Mobile旧有视图布局。

2.修改Apex Mobile News刷新控件。

Apex Mobile/Apex Mobile.xcodeproj/project.pbxproj

@@ -18,6 +18,7 @@
 		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 */; };
+		426E8ABD2021AEC50073BA5D /* JLCustomerNavigationAlertController.m in Sources */ = {isa = PBXBuildFile; fileRef = 426E8ABC2021AEC50073BA5D /* JLCustomerNavigationAlertController.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 */; };
@@ -180,6 +181,8 @@
 		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>"; };
+		426E8ABB2021AEC50073BA5D /* JLCustomerNavigationAlertController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = JLCustomerNavigationAlertController.h; sourceTree = "<group>"; };
+		426E8ABC2021AEC50073BA5D /* JLCustomerNavigationAlertController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JLCustomerNavigationAlertController.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>"; };
@@ -517,6 +520,8 @@
 				426E8AB6202163EC0073BA5D /* JLCustomerAlertController.m */,
 				426E8AB7202163EC0073BA5D /* JLPresentationController.h */,
 				426E8AB8202163EC0073BA5D /* JLPresentationController.m */,
+				426E8ABB2021AEC50073BA5D /* JLCustomerNavigationAlertController.h */,
+				426E8ABC2021AEC50073BA5D /* JLCustomerNavigationAlertController.m */,
 			);
 			path = Alert;
 			sourceTree = "<group>";
@@ -1130,6 +1135,7 @@
 				715643D3201ACB1700B04267 /* StaticModeTableViewCell.m in Sources */,
 				718BE8B2190F9D970046EA6A /* MyAutocompleteItemsSource.m in Sources */,
 				71406DCE18C36A52000914C4 /* TableCellBool.m in Sources */,
+				426E8ABD2021AEC50073BA5D /* JLCustomerNavigationAlertController.m in Sources */,
 				71A01D7F18C9AEC8003307A9 /* DetailCellWeb.m in Sources */,
 				71A01D8518C9BDC8003307A9 /* DetailTabBarController.m in Sources */,
 				71F67CFC19066375004E8462 /* PulldownMenu.m in Sources */,

Apex Mobile/Apex Mobile/Alert/JLCustomerNavigationAlertController.h

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

Apex Mobile/Apex Mobile/Alert/JLCustomerNavigationAlertController.m

@@ -0,0 +1,89 @@
+//
+//  JLCustomerNavigationAlertController.m
+//  Apex Mobile
+//
+//  Created by Jack on 2018/1/31.
+//  Copyright © 2018年 United Software Applications, Inc. All rights reserved.
+//
+
+#import "JLCustomerNavigationAlertController.h"
+#import "JLPresentationController.h"
+
+@interface JLCustomerNavigationAlertController () <UIViewControllerTransitioningDelegate>
+
+@end
+
+@implementation JLCustomerNavigationAlertController
+
+- (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;
+}
+
+- (instancetype)initWithRootViewController:(UIViewController *)rootViewController {
+    if (self = [super initWithRootViewController:rootViewController]) {
+        [self comonInit];
+    }
+    return self;
+}
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // Do any additional setup after loading the view.
+}
+
+- (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/AppDelegate.m

@@ -39,6 +39,7 @@
   
     self.password= [AESCrypt decrypt:[defaults stringForKey:@"password"] password:@"usai"];
 
+    self.window.backgroundColor = [UIColor whiteColor];
     
     return YES;
 }

Apex Mobile/Apex Mobile/CellItemHistory.h

@@ -11,5 +11,6 @@
 @interface CellItemHistory : UITableViewCell
 @property (strong, nonatomic) IBOutlet UILabel *name;
 @property (strong, nonatomic) IBOutlet UILabel *time;
+@property (strong, nonatomic) IBOutlet UIImageView *icon;
 
 @end

Apex Mobile/Apex Mobile/ChangePasswordViewController.h

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

Apex Mobile/Apex Mobile/HistoryViewController.m

@@ -87,6 +87,28 @@
     NSString* name = [self.data.pagedata[indexPath.row] valueForKey:@"name"];
     NSString* create_time = [self.data.pagedata[indexPath.row] valueForKey:@"create_time"];
 
+    NSString *module_name = [self.data.pagedata[indexPath.row] valueForKey:@"module_name"];
+    
+    if ([module_name isEqualToString:@"Ocean Booking"]) {
+        
+        cell.icon.image = [[UIImage imageNamed:@"mode_booking"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        
+    } else if ([module_name isEqualToString:@"Container detail"]) {
+        
+        cell.icon.image = [[UIImage imageNamed:@"mode_container"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        
+    } else if ([module_name isEqualToString:@"Ocean B/L info."]) {
+        
+        cell.icon.image = [[UIImage imageNamed:@"mode_bl"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        
+    } else if ([module_name isEqualToString:@"Cargo Tracking"]) {
+        
+        cell.icon.image = [[UIImage imageNamed:@"mode_cargo_tracking"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        
+    } else {
+        
+        cell.icon.image = [[UIImage imageNamed:@"mode_document"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+    }
     
     cell.name.text = name;
     [cell.name sizeToFit];

Apex Mobile/Apex Mobile/Main.storyboard

@@ -1,8 +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>
@@ -52,11 +55,11 @@
                         <viewControllerLayoutGuide type="bottom" id="GqU-ke-DJ1"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="X6q-dB-qSM">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="VSo-fp-Aqt">
-                                <rect key="frame" x="0.0" y="20" width="600" height="531"/>
+                                <rect key="frame" x="0.0" y="20" width="375" height="598"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <connections>
                                     <outlet property="dataSource" destination="cXn-4T-TpY" id="hp4-PI-gpw"/>
@@ -91,11 +94,11 @@
                         <viewControllerLayoutGuide type="bottom" id="3Te-oX-ftj"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="QxY-X5-VD0">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" rowHeight="110" estimatedRowHeight="110" sectionHeaderHeight="-1" sectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="Vjd-jz-qR0">
-                                <rect key="frame" x="0.0" y="20" width="600" height="531"/>
+                                <rect key="frame" x="0.0" y="20" width="375" height="598"/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <connections>
                                     <outlet property="dataSource" destination="XAM-wb-CvU" id="UGh-l6-38n"/>
@@ -130,14 +133,14 @@
                         <viewControllerLayoutGuide type="bottom" id="deU-wF-9js"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="lHV-oi-ARt">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="OnO-n9-f7N">
-                                <rect key="frame" x="0.0" y="235" width="600" height="130"/>
+                                <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="132.5" y="0.0" width="335" height="30"/>
+                                        <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"/>
@@ -147,13 +150,13 @@
                                         <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="132.5" y="50" width="335" height="30"/>
+                                        <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="429.5" y="100" width="38" height="30"/>
+                                        <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"/>
@@ -163,7 +166,7 @@
                                         </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="132.5" y="106" width="127" height="18"/>
+                                        <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">
@@ -172,7 +175,7 @@
                                         </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="399.5" y="105" width="20" height="20"/>
+                                        <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>
@@ -193,14 +196,14 @@
                                 </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="237" y="497" width="126" height="30"/>
+                                <rect key="frame" x="124.5" y="564" width="126" height="30"/>
                                 <state key="normal" title="Retrieve password"/>
                                 <connections>
                                     <action selector="RetrieveButtonClick:" destination="RGM-u2-C1G" eventType="touchUpInside" id="kKP-WL-fGb"/>
                                 </connections>
                             </button>
                             <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="apexlogo-2" translatesAutoresizingMaskIntoConstraints="NO" id="zKh-Ur-Gus">
-                                <rect key="frame" x="162" y="49" width="276" height="120"/>
+                                <rect key="frame" x="49.5" y="49" width="276" height="120"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="120" id="JPD-SD-EHj"/>
                                     <constraint firstAttribute="width" constant="276" id="oAG-Aj-MVG"/>
@@ -245,11 +248,11 @@
                         <viewControllerLayoutGuide type="bottom" id="6yV-PD-KCp"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="ifC-vl-u6I">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" translatesAutoresizingMaskIntoConstraints="NO" id="iIl-j9-7oa">
-                                <rect key="frame" x="0.0" y="50" width="600" height="501"/>
+                                <rect key="frame" x="0.0" y="50" width="375" height="568"/>
                                 <color key="backgroundColor" cocoaTouchSystemColor="groupTableViewBackgroundColor"/>
                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 <connections>
@@ -258,7 +261,7 @@
                                 </connections>
                             </tableView>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3xo-DP-qWN">
-                                <rect key="frame" x="0.0" y="20" width="600" height="30"/>
+                                <rect key="frame" x="0.0" y="20" width="375" height="30"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Recently" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ouQ-Yg-iZI">
                                         <rect key="frame" x="10" y="5" width="66.5" height="21"/>
@@ -305,11 +308,11 @@
                         <viewControllerLayoutGuide type="bottom" id="NOX-Oo-aNI"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="MuK-Mj-PtU">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="grouped" separatorStyle="default" rowHeight="44" sectionHeaderHeight="10" sectionFooterHeight="10" translatesAutoresizingMaskIntoConstraints="NO" id="t4w-1J-ZSQ">
-                                <rect key="frame" x="0.0" y="20" width="600" height="531"/>
+                                <rect key="frame" x="0.0" y="20" width="375" height="598"/>
                                 <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="tools" textLabel="tg4-Ox-UsK" style="IBUITableViewCellStyleDefault" id="tq0-wS-k0Y">
@@ -362,7 +365,7 @@
                         <viewControllerLayoutGuide type="bottom" id="Z0g-Fz-l0r"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="ggR-kU-S5e">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                     </view>
@@ -378,11 +381,11 @@
             <objects>
                 <viewController storyboardIdentifier="About" useStoryboardIdentifierAsRestorationIdentifier="YES" id="7fk-ll-nfY" customClass="AboutViewController" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="kYm-r8-x3q">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <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" 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="600" height="580"/>
+                                <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"/>
@@ -417,7 +420,7 @@
                         <viewControllerLayoutGuide type="bottom" id="kHM-0E-Dsh"/>
                     </layoutGuides>
                     <view key="view" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" id="xU3-mF-FWx">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <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"/>
                     </view>
@@ -439,7 +442,7 @@
                         <viewControllerLayoutGuide type="bottom" id="NRY-LM-qAI"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Ssf-nl-y6a">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <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" image="apexlogo-2" translatesAutoresizingMaskIntoConstraints="NO" id="kly-ZP-lFy">
@@ -450,7 +453,7 @@
                                 </constraints>
                             </imageView>
                             <webView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Abt-ML-WTx">
-                                <rect key="frame" x="0.0" y="76" width="600" height="524"/>
+                                <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"/>
@@ -484,11 +487,11 @@
                         <viewControllerLayoutGuide type="bottom" id="2sz-FS-Gr9"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="uxr-eR-WO2">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <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" 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="600" height="600"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                                 <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">
@@ -499,22 +502,22 @@
                                             <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" translatesAutoresizingMaskIntoConstraints="NO" id="Bkc-WL-mze">
-                                                    <rect key="frame" x="79" y="0.0" width="258" height="21"/>
+                                                    <rect key="frame" x="70" y="4.5" width="267" 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" 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"/>
+                                                    <rect key="frame" x="70" y="28.5" width="267" height="31"/>
                                                     <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"/>
+                                                <imageView autoresizesSubviews="NO" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="rect_market_news" translatesAutoresizingMaskIntoConstraints="NO" id="c0R-J8-9uA">
+                                                    <rect key="frame" x="10" y="4.5" width="55" height="55"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="64" id="6FD-Gf-avq"/>
-                                                        <constraint firstAttribute="height" constant="64" id="miM-A5-vlN"/>
+                                                        <constraint firstAttribute="width" constant="55" id="6FD-Gf-avq"/>
+                                                        <constraint firstAttribute="height" constant="55" id="miM-A5-vlN"/>
                                                     </constraints>
                                                 </imageView>
                                             </subviews>
@@ -544,7 +547,7 @@
                                 </connections>
                             </tableView>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="Kgw-c0-JVW">
-                                <rect key="frame" x="281.5" y="281.5" width="37" height="37"/>
+                                <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"/>
@@ -580,19 +583,19 @@
                         <viewControllerLayoutGuide type="bottom" id="FpR-kZ-qvh"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="obf-ZQ-pbd">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelection="NO" rowHeight="82" sectionHeaderHeight="22" sectionFooterHeight="42" translatesAutoresizingMaskIntoConstraints="NO" id="ppj-4o-rzu">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="556"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
                                 <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" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="item_date" rowHeight="82" id="mTz-zv-fyY" customClass="TableCellDate">
-                                        <rect key="frame" x="0.0" y="22" width="600" height="82"/>
+                                        <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="mTz-zv-fyY" id="ExR-Af-j3g">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="81.5"/>
+                                            <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" restorationIdentifier="edit_from" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="From" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Fj7-9i-IJL">
@@ -608,7 +611,7 @@
                                                     </connections>
                                                 </textField>
                                                 <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="455" y="38" width="135" height="30"/>
+                                                    <rect key="frame" x="230" y="38" width="135" height="30"/>
                                                     <constraints>
                                                         <constraint firstAttribute="width" constant="135" id="9X7-Dw-ULj"/>
                                                     </constraints>
@@ -619,7 +622,7 @@
                                                     </connections>
                                                 </textField>
                                                 <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="580" height="21"/>
+                                                    <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"/>
@@ -642,20 +645,20 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" accessoryType="disclosureIndicator" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="item_bool" rowHeight="82" id="cff-AI-2yS" customClass="TableCellBool">
-                                        <rect key="frame" x="0.0" y="104" width="600" height="82"/>
+                                        <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="cff-AI-2yS" id="78g-DF-IJU">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="81.5"/>
+                                            <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" text="item_bool" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="94I-uG-uW7">
-                                                    <rect key="frame" x="10" y="10" width="547" height="21"/>
+                                                    <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" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="XF6-7j-X0s">
-                                                    <rect key="frame" x="10" y="0.0" width="547" height="81"/>
+                                                    <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"/>
@@ -682,20 +685,20 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="item_edit" rowHeight="82" id="wQN-d1-kMW" customClass="TableCellEdit">
-                                        <rect key="frame" x="0.0" y="186" width="600" height="82"/>
+                                        <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="wQN-d1-kMW" id="3St-ZX-jbo">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="81.5"/>
+                                            <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" text="item_edit" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5yL-Qn-keV">
-                                                    <rect key="frame" x="10" y="10" width="580" height="21"/>
+                                                    <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" 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="580" height="30"/>
+                                                    <rect key="frame" x="10" y="38" width="355" height="30"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <textInputTraits key="textInputTraits" returnKeyType="done"/>
                                                     <connections>
@@ -724,12 +727,12 @@
                                 </connections>
                             </tableView>
                             <toolbar opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="FYC-YO-04g">
-                                <rect key="frame" x="0.0" y="556" width="600" height="44"/>
+                                <rect key="frame" x="0.0" y="623" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                 <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="20" y="7" width="36" height="30"/>
+                                            <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"/>
@@ -742,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="532" y="7" width="48" height="30"/>
+                                            <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"/>
@@ -781,11 +784,11 @@
                         <viewControllerLayoutGuide type="bottom" id="myi-Th-psK"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="nCN-Lb-GMK">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="HZ1-FP-IVf" customClass="SimpleGrid">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="556"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="623"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </scrollView>
@@ -795,12 +798,12 @@
                                 <color key="color" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </activityIndicatorView>
                             <toolbar opaque="NO" clearsContextBeforeDrawing="NO" tag="301" contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="vGm-Oy-R6j">
-                                <rect key="frame" x="0.0" y="556" width="600" height="44"/>
+                                <rect key="frame" x="0.0" y="623" width="375" height="44"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                 <items>
                                     <barButtonItem style="plain" id="BxS-sd-Ww4">
                                         <button key="customView" opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="MDg-tk-V9T">
-                                            <rect key="frame" x="20" y="5.5" width="73" height="33"/>
+                                            <rect key="frame" x="16" y="5.5" width="73" height="33"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <state key="normal" title="Pre Page">
                                                 <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -815,7 +818,7 @@
                                     <barButtonItem style="plain" systemItem="flexibleSpace" id="bLa-H3-XMT"/>
                                     <barButtonItem style="plain" id="F78-3m-Pcr">
                                         <button key="customView" opaque="NO" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" id="ta5-UY-kET">
-                                            <rect key="frame" x="507" y="5.5" width="73" height="33"/>
+                                            <rect key="frame" x="286" y="5.5" width="73" height="33"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <state key="normal" title="Next Page">
                                                 <color key="titleShadowColor" red="0.5" green="0.5" blue="0.5" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -858,7 +861,7 @@
                         <viewControllerLayoutGuide type="bottom" id="kXc-Ph-sWh"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="utH-2m-x08">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="w7y-tI-BLn">
@@ -867,16 +870,16 @@
                                 <color key="color" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </activityIndicatorView>
                             <tableView hidden="YES" clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="TxA-8D-Obq">
-                                <rect key="frame" x="0.0" y="65" width="600" height="535"/>
+                                <rect key="frame" x="0.0" y="65" width="375" height="602"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <color key="sectionIndexColor" red="0.88766825199999999" green="0.88764166830000002" blue="0.88765668870000003" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <prototypes>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="tableitemmsg" id="80c-yE-rdF" customClass="MessageItem">
-                                        <rect key="frame" x="0.0" y="22" width="600" height="44"/>
+                                        <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="80c-yE-rdF" id="C2c-BR-X3b">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <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="vQR-pc-5xk">
@@ -933,36 +936,36 @@
                         <viewControllerLayoutGuide type="bottom" id="a4H-ec-9Dk"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="g6Y-DB-Hod">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="65" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="Dw1-MH-d07">
-                                <rect key="frame" x="0.0" y="64" width="600" height="492"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="559"/>
                                 <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" restorationIdentifier="cell_item_history" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="cell_item_history" rowHeight="65" id="KUP-Am-SEU" customClass="CellItemHistory">
-                                        <rect key="frame" x="0.0" y="22" width="600" height="65"/>
+                                        <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="KUP-Am-SEU" id="Hb4-Tl-jhw">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="64.5"/>
+                                            <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" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Uow-re-de3">
-                                                    <rect key="frame" x="85" y="5" width="505" height="21"/>
+                                                    <rect key="frame" x="70" y="5" width="295" 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>
                                                 <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"/>
+                                                    <rect key="frame" x="10" y="7.5" width="50" height="50"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="height" constant="65" id="Edc-JY-dE4"/>
-                                                        <constraint firstAttribute="width" constant="65" id="jtA-MQ-fDI"/>
+                                                        <constraint firstAttribute="height" constant="50" id="Edc-JY-dE4"/>
+                                                        <constraint firstAttribute="width" constant="50" 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="505" height="17"/>
+                                                    <rect key="frame" x="70" y="36" width="295" height="17"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                                     <nil key="highlightedColor"/>
@@ -980,6 +983,7 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
+                                            <outlet property="icon" destination="1xj-Cr-Ecf" id="Xrc-Fu-vRa"/>
                                             <outlet property="name" destination="Uow-re-de3" id="rUz-qL-lle"/>
                                             <outlet property="time" destination="RJz-KQ-Fv2" id="Um9-9d-Whk"/>
                                         </connections>
@@ -1007,38 +1011,38 @@
                         <viewControllerLayoutGuide type="bottom" id="Be3-Yr-CdQ"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="UNP-Bt-ggi">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="65" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="czc-uu-ydi">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="580"/>
+                                <rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
                                 <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" restorationIdentifier="cell_item_history" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="cell_item_history" rowHeight="65" id="x3V-Ev-KXe" customClass="CellItemHistory">
-                                        <rect key="frame" x="0.0" y="22" width="600" height="65"/>
+                                        <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="x3V-Ev-KXe" id="8TO-KO-16G">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="64.5"/>
+                                            <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" text="name" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tp8-Ek-fGC">
-                                                    <rect key="frame" x="85" y="5" width="505" height="21"/>
+                                                    <rect key="frame" x="70" y="5" width="295" 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" text="time" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nzO-0Q-mKW">
-                                                    <rect key="frame" x="85" y="36" width="505" height="17"/>
+                                                    <rect key="frame" x="70" y="36" width="295" 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"/>
+                                                    <rect key="frame" x="10" y="6.5" width="50" height="50"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" constant="65" id="Yx6-AT-Mbf"/>
-                                                        <constraint firstAttribute="height" constant="65" id="fBz-G8-b1l"/>
+                                                        <constraint firstAttribute="width" constant="50" id="Yx6-AT-Mbf"/>
+                                                        <constraint firstAttribute="height" constant="50" id="fBz-G8-b1l"/>
                                                     </constraints>
                                                 </imageView>
                                             </subviews>
@@ -1054,6 +1058,7 @@
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
+                                            <outlet property="icon" destination="UI6-iv-41o" id="LQd-xH-RjO"/>
                                             <outlet property="name" destination="tp8-Ek-fGC" id="G4w-eU-Poj"/>
                                             <outlet property="time" destination="nzO-0Q-mKW" id="8rf-hj-YDx"/>
                                         </connections>
@@ -1085,23 +1090,23 @@
                         <viewControllerLayoutGuide type="bottom" id="rM1-Ya-3bY"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="ZRM-ao-20K">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="QAF-Zi-uoj">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                <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="documentitem" textLabel="2vf-O6-CXq" imageView="vJN-YF-dbw" style="IBUITableViewCellStyleDefault" id="fFD-VO-CKz">
-                                        <rect key="frame" x="0.0" y="22" width="600" height="44"/>
+                                        <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="fFD-VO-CKz" id="IND-eh-Wg5">
-                                            <rect key="frame" x="0.0" y="0.0" width="567" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="342" 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="2vf-O6-CXq">
-                                                    <rect key="frame" x="74" y="0.0" width="491" height="43.5"/>
+                                                    <rect key="frame" x="74" y="0.0" width="266" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <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"/>
@@ -1140,11 +1145,11 @@
                         <viewControllerLayoutGuide type="bottom" id="oJN-0J-fi0"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="XVG-tV-s5j">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <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" 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="580" height="30"/>
+                                <rect key="frame" x="10" y="30" width="355" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="wVN-P8-uR2"/>
                                 </constraints>
@@ -1156,7 +1161,7 @@
                                 </connections>
                             </textField>
                             <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="580" height="30"/>
+                                <rect key="frame" x="10" y="110" width="355" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="xoj-pD-tGz"/>
                                 </constraints>
@@ -1167,7 +1172,7 @@
                                     <outlet property="delegate" destination="adW-Ar-52t" id="Fhr-0F-cwc"/>
                                 </connections>
                             </textField>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gUy-8S-kFU">
+                            <button hidden="YES" 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"/>
@@ -1180,7 +1185,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="EZm-dC-lQ4">
-                                <rect key="frame" x="537" y="150" width="53" height="30"/>
+                                <rect key="frame" x="312" y="150" width="53" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="xac-v9-MaN"/>
                                 </constraints>
@@ -1193,12 +1198,12 @@
                                 </connections>
                             </button>
                             <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="281.5" y="281.5" width="37" height="37"/>
+                                <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="580" height="30"/>
+                                <rect key="frame" x="10" y="70" width="355" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="vO4-mR-qW6"/>
                                 </constraints>
@@ -1253,23 +1258,23 @@
                         <viewControllerLayoutGuide type="bottom" id="Ywt-1O-7AV"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="VfZ-Dv-e9a">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" restorationIdentifier="field" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" allowsSelectionDuringEditing="YES" rowHeight="44" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="iXC-3g-FEF">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                <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" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="field" textLabel="4Dk-AL-yOW" style="IBUITableViewCellStyleDefault" id="RIX-gb-GVS">
-                                        <rect key="frame" x="0.0" y="22" width="600" height="44"/>
+                                        <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="RIX-gb-GVS" id="0R9-wZ-hpp">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                            <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="" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="4Dk-AL-yOW">
-                                                    <rect key="frame" x="15" y="0.0" width="570" height="43.5"/>
+                                                    <rect key="frame" x="15" y="0.0" width="345" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <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"/>
@@ -1312,11 +1317,11 @@
                         <viewControllerLayoutGuide type="bottom" id="pzr-t6-dCp"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="qVj-DC-yAZ">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <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" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="User name" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="rNA-kt-gF6">
-                                <rect key="frame" x="160" y="53" width="280" height="30"/>
+                                <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"/>
@@ -1328,7 +1333,7 @@
                                 </connections>
                             </textField>
                             <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="160" y="88" width="280" height="30"/>
+                                <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"/>
@@ -1340,7 +1345,7 @@
                                 </connections>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="gha-2I-ENG">
-                                <rect key="frame" x="159.5" y="128" width="48" height="30"/>
+                                <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>
@@ -1349,7 +1354,7 @@
                                 </connections>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="oJM-ge-k0D">
-                                <rect key="frame" x="409.5" y="128" width="30" height="30"/>
+                                <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>
@@ -1358,12 +1363,12 @@
                                 </connections>
                             </button>
                             <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="222" y="25" width="156.5" height="23"/>
+                                <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="281.5" y="281.5" width="37" height="37"/>
+                                <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>
@@ -1405,11 +1410,11 @@
                         <viewControllerLayoutGuide type="bottom" id="FaQ-xe-e1Q"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="jIR-1G-8HO">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <webView contentMode="scaleToFill" fixedFrame="YES" allowsInlineMediaPlayback="NO" mediaPlaybackRequiresUserAction="NO" mediaPlaybackAllowsAirPlay="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oc3-xQ-e3B">
-                                <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                                <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"/>
                                 <dataDetectorType key="dataDetectorTypes"/>
@@ -1437,7 +1442,7 @@
                         <viewControllerLayoutGuide type="bottom" id="WfC-yf-L95"/>
                     </layoutGuides>
                     <view key="view" contentMode="scaleToFill" id="Sml-Qx-H9e">
-                        <rect key="frame" x="0.0" y="0.0" width="600" height="600"/>
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                         <subviews>
                             <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" fixedFrame="YES" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="Cs2-5V-Ius">
@@ -1447,7 +1452,7 @@
                                 <color key="color" red="0.40000000600000002" green="0.80000001190000003" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                             </activityIndicatorView>
                             <label hidden="YES" opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="No record in this page" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="AKO-ni-aUG">
-                                <rect key="frame" x="0.0" y="64" width="600" height="21"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="21"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMaxY="YES"/>
                                 <color key="backgroundColor" red="0.1019607843" green="0.67843137249999996" blue="0.94117647059999998" alpha="0.69999999999999996" colorSpace="custom" customColorSpace="sRGB"/>
                                 <inset key="insetFor6xAndEarlier" minX="0.0" minY="64" maxX="0.0" maxY="-64"/>
@@ -1456,7 +1461,7 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <tableView clipsSubviews="YES" contentMode="scaleToFill" fixedFrame="YES" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" allowsSelection="NO" rowHeight="-1" sectionHeaderHeight="22" sectionFooterHeight="22" translatesAutoresizingMaskIntoConstraints="NO" id="mia-XC-A8d">
-                                <rect key="frame" x="0.0" y="64" width="600" height="492"/>
+                                <rect key="frame" x="0.0" y="64" width="375" height="559"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <inset key="insetFor6xAndEarlier" minX="0.0" minY="64" maxX="0.0" maxY="44"/>
@@ -1464,10 +1469,10 @@
                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 <prototypes>
                                     <tableViewCell tag="1" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="detail_item_tracking" rowHeight="64" id="OoD-Qf-0BP" customClass="DetailCellTracking">
-                                        <rect key="frame" x="0.0" y="22" width="600" height="64"/>
+                                        <rect key="frame" x="0.0" y="22" width="375" height="64"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="OoD-Qf-0BP" id="8tS-jl-4gn">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="63.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="63.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="8An-KQ-ebO">
@@ -1489,10 +1494,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="detail_item_list" id="mmm-lx-xXJ" customClass="DetailCellList">
-                                        <rect key="frame" x="0.0" y="86" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="86" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mmm-lx-xXJ" id="q9z-Ac-77Z">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <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="Fv6-ui-cri">
@@ -1509,10 +1514,10 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="detail_item_kv" id="AYO-lZ-eor" customClass="DetailCellKV">
-                                        <rect key="frame" x="0.0" y="130" width="600" height="44"/>
+                                        <rect key="frame" x="0.0" y="130" width="375" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="AYO-lZ-eor" id="VZB-eb-sJm">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="43.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="43.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <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="n69-9u-Nfw">
@@ -1535,14 +1540,14 @@
                                         </connections>
                                     </tableViewCell>
                                     <tableViewCell tag="1" contentMode="scaleToFill" selectionStyle="blue" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="detail_item_web" rowHeight="164" id="BGQ-aG-f1B" customClass="DetailCellWeb">
-                                        <rect key="frame" x="0.0" y="174" width="600" height="164"/>
+                                        <rect key="frame" x="0.0" y="174" width="375" height="164"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="BGQ-aG-f1B" id="pJM-s3-5O7">
-                                            <rect key="frame" x="0.0" y="0.0" width="600" height="163.5"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="375" height="163.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <webView contentMode="scaleToFill" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="a2k-TN-pCa">
-                                                    <rect key="frame" x="0.0" y="0.0" width="600" height="163"/>
+                                                    <rect key="frame" x="0.0" y="0.0" width="375" height="163"/>
                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                     <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                     <dataDetectorType key="dataDetectorTypes" link="YES"/>

Apex Mobile/Apex Mobile/MylistViewController.m

@@ -12,6 +12,7 @@
 #import "LocalDocumentsViewController.h"
 #import "MessageViewController.h"
 #import "ChangePasswordViewController.h"
+#import "JLCustomerNavigationAlertController.h"
 
 
 @interface MylistViewController ()
@@ -114,11 +115,18 @@
         ChangePasswordViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"ChangePassword"];
         //        newsview.module_name = @"Market news";
         
-        viewcontroller.preferredContentSize = CGSizeMake(350, 170);
+        
         
 //        [self.navigationController pushViewController:viewcontroller animated:YES];
         
-        [self presentViewController:viewcontroller animated:YES completion:nil];
+        UIBarButtonItem *closeItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"ic_exit"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] style:UIBarButtonItemStylePlain target:self action:@selector(dismissPresentedVC:)];
+        viewcontroller.navigationItem.rightBarButtonItem = closeItem;
+        
+        
+        JLCustomerNavigationAlertController *nav = [[JLCustomerNavigationAlertController alloc] initWithRootViewController:viewcontroller];
+        nav.preferredContentSize = CGSizeMake(350, 170);
+        
+        [self presentViewController:nav animated:YES completion:nil];
         
     }
     else if([type isEqualToString:@"logout"])
@@ -143,4 +151,8 @@
 }
 */
 
+- (void)dismissPresentedVC:(id)sender {
+    [self.presentedViewController dismissViewControllerAnimated:YES completion:nil];
+}
+
 @end

Apex Mobile/Apex Mobile/NewsViewController.m

@@ -8,7 +8,10 @@
 
 #import "NewsViewController.h"
 #import "NewsDetailViewController.h"
-@interface NewsViewController ()
+#import "JLRefreshFooter.h"
+
+
+@interface NewsViewController ()<JLRefreshDelegate>
 
 @end
 
@@ -27,9 +30,14 @@
 {
     return UIInterfaceOrientationPortrait;
 }
--(void) loadpage
-{
-    
+
+/**
+ * 0: init load
+ * 1: refresh
+ * 2: load more
+ */
+- (void)loadContentWithOption:(int)option Complete:(void (^)(int result))finish {
+    self.mum.hidden = NO;
     //    [self.params setValue:[NSString stringWithFormat:@"%ld",self.offset] forKey:@"offset"];
     self.mum.center = self.view.center;
     self.btnrefresh.enabled = false;
@@ -76,13 +84,20 @@
                     self.btnrefresh.titleLabel.text =NSLocalizedString(@"load_more",nil);
                     //                    [self.btnrefresh setTitle:@"Load more" forState:UIControlStateNormal];
                 }
+                
+                if (finish) {
+                    finish(2);
+                }
+                
                 [self.tableview reloadData ];
             }
             else
             {
                 self.btnrefresh.enabled = true;
                 [self.btnrefresh setTitle:@"Load more" forState:UIControlStateNormal];
-                
+                if (finish) {
+                    finish(0);
+                }
             }
             
             
@@ -91,6 +106,14 @@
             
         });
     });
+    
+}
+
+-(void) loadpage
+{
+    [self loadContentWithOption:0 Complete:^(int result) {
+        
+    }];
 }
 
 - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
@@ -122,21 +145,30 @@
     self.limit = 10;
     self.data = [[NewsData alloc] init:self.limit];
     
+    if (@available(iOS 11,*)) {
+        self.tableview.contentInsetAdjustmentBehavior = UIScrollViewContentInsetAdjustmentNever;
+    } else {
+        self.automaticallyAdjustsScrollViewInsets = NO;
+    }
     
     
+//    self.btnrefresh = [UIButton buttonWithType:UIButtonTypeCustom];
+//    //    self.btnrefresh.titleLabel.text =@"Load more";
+//
+//    [self.btnrefresh setTitle:@"Load more" forState:UIControlStateNormal];
+//    self.btnrefresh.titleLabel.adjustsFontSizeToFitWidth = YES;
+////    [self.btnrefresh.titleLabel sizeToFit];
+//    self.btnrefresh.hidden = true;
+//    [self.btnrefresh setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
+//    self.btnrefresh.backgroundColor = [UIColor lightGrayColor];
+//    [self.btnrefresh addTarget:self action:@selector(loadmore) forControlEvents:UIControlEventTouchUpInside];
+//    self.btnrefresh.frame =CGRectMake(0.0f, 0.0f, self.tableview.bounds.size.width, 44.0f);
+//    self.tableview.tableFooterView = self.btnrefresh;//tableFooterView;
     
-    self.btnrefresh = [UIButton buttonWithType:UIButtonTypeCustom];
-    //    self.btnrefresh.titleLabel.text =@"Load more";
+    JLRefreshFooter *footer = [[JLRefreshFooter alloc] init];
+    footer.refreshDelegate = self;
+    self.tableview.jl_footer = footer;
     
-    [self.btnrefresh setTitle:@"Load more" forState:UIControlStateNormal];
-    self.btnrefresh.titleLabel.adjustsFontSizeToFitWidth = YES;
-//    [self.btnrefresh.titleLabel sizeToFit];
-    self.btnrefresh.hidden = true;
-    [self.btnrefresh setTitleColor:[UIColor blackColor] forState:UIControlStateNormal];
-    self.btnrefresh.backgroundColor = [UIColor lightGrayColor];
-    [self.btnrefresh addTarget:self action:@selector(loadmore) forControlEvents:UIControlEventTouchUpInside];
-    self.btnrefresh.frame =CGRectMake(0.0f, 0.0f, self.tableview.bounds.size.width, 44.0f);
-    self.tableview.tableFooterView = self.btnrefresh;//tableFooterView;
     
     [self loadpage];
 }
@@ -269,4 +301,29 @@
     //    }
 }
 
+#pragma mark - Refresh Delegate
+
+- (void)jl_beginRefresh:(JLRefreshBasis *)refresh {
+    
+    if (refresh == self.tableview.jl_footer) {
+        
+        [self loadContentWithOption:2 Complete:^(int result) {
+            if (self.data.finishload==true) {
+                [(JLRefreshFooter *)self.tableview.jl_footer  noMoreData];
+            } else {
+                [self.tableview.jl_footer  endRefresh];
+            }
+            
+        }];
+    }
+}
+
+- (void)jl_pullRefresh:(JLRefreshBasis *)refresh state:(JLRefreshState)state percentage:(float)percentage {
+    
+}
+
+- (void)jl_endRefresh:(JLRefreshBasis *)refresh {
+    
+}
+
 @end

Apex Mobile/Apex Mobile/ToolslistViewController.m

@@ -11,6 +11,7 @@
 #import "NewsViewController.h"
 #import "ApexHistoryViewController.h"
 #import "LocationViewController.h"
+#import "JLCustomerNavigationAlertController.h"
 
 @interface ToolslistViewController ()
 
@@ -140,10 +141,22 @@
     {
         AboutViewController *viewcontroller=[[UIStoryboard storyboardWithName:@"Main" bundle:nil] instantiateViewControllerWithIdentifier:@"About"];
         //        newsview.module_name = @"Market news";
-        [self.navigationController pushViewController:viewcontroller animated:YES];
+        
+//        [self.navigationController pushViewController:viewcontroller animated:YES];
+        
+        UIBarButtonItem *closeItem = [[UIBarButtonItem alloc] initWithImage:[[UIImage imageNamed:@"ic_exit"] imageWithRenderingMode:UIImageRenderingModeAlwaysOriginal] style:UIBarButtonItemStylePlain target:self action:@selector(dismissPresentedVC:)];
+        viewcontroller.navigationItem.rightBarButtonItem = closeItem;
+        JLCustomerNavigationAlertController *nav = [[JLCustomerNavigationAlertController alloc] initWithRootViewController:viewcontroller];
+        nav.preferredContentSize = CGSizeMake(280, 120);
+        [self presentViewController:nav animated:YES completion:nil];
     }
 
 }
+
+- (void)dismissPresentedVC:(id)sender {
+    [self.presentedViewController dismissViewControllerAnimated:YES completion:nil];
+}
+
 /*
 #pragma mark - Navigation
 

Apex Mobile/FavoritesViewController.m

@@ -90,6 +90,29 @@
     NSString* name = [self.data.pagedata[indexPath.row] valueForKey:@"name"];
     NSString* create_time = [self.data.pagedata[indexPath.row] valueForKey:@"create_time"];
     
+    NSString *module_name = [self.data.pagedata[indexPath.row] valueForKey:@"module_name"];
+    // Cargo Tracking
+    
+    if ([module_name isEqualToString:@"Ocean Booking"]) {
+        
+        cell.icon.image = [[UIImage imageNamed:@"mode_booking"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        
+    } else if ([module_name isEqualToString:@"Container detail"]) {
+        
+        cell.icon.image = [[UIImage imageNamed:@"mode_container"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        
+    } else if ([module_name isEqualToString:@"Ocean B/L info."]) {
+        
+        cell.icon.image = [[UIImage imageNamed:@"mode_bl"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        
+    } else if ([module_name isEqualToString:@"Cargo Tracking"]) {
+        
+        cell.icon.image = [[UIImage imageNamed:@"mode_cargo_tracking"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+        
+    } else {
+        
+        cell.icon.image = [[UIImage imageNamed:@"mode_document"] imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate];
+    }
     
     cell.name.text = name;
     [cell.name sizeToFit];