diff --git a/GMERemittance/Module/Home/User Interface/View/ViewModels/HomeCollectionModel.swift b/GMERemittance/Module/Home/User Interface/View/ViewModels/HomeCollectionModel.swift
index 8aa2ef8c..ff7162cd 100644
--- a/GMERemittance/Module/Home/User Interface/View/ViewModels/HomeCollectionModel.swift	
+++ b/GMERemittance/Module/Home/User Interface/View/ViewModels/HomeCollectionModel.swift	
@@ -13,8 +13,3 @@ class HomeCollectionModel {
     var title: String?
     var icon: UIImage?
 }
-
-//private var collectionViewMenuIconArray: [Int: String] = [0: "send-money", 1: "mobile-recharge", 2: "rate-today", 3: "track-transfer", 4: "transaction-statement", 5: "wallet-transfer", 6: "show-more"]
-//
-//private var collectionViewMenuNameArray: [Int: String] = [0: "Send Money", 1: "Mobile Recharge", 2: "Today's Rate", 3: "Track Your Transfer", 4: "Transaction Statement", 5: "Wallet to Wallet Transfer", 6: "More"]
-//
diff --git a/GMERemittance/Module/TransactionHistory/User Interface/View/DatePickerViewController.swift b/GMERemittance/Module/TransactionHistory/User Interface/View/DatePickerViewController.swift
index 4c28a262..933a9e87 100644
--- a/GMERemittance/Module/TransactionHistory/User Interface/View/DatePickerViewController.swift	
+++ b/GMERemittance/Module/TransactionHistory/User Interface/View/DatePickerViewController.swift	
@@ -11,6 +11,18 @@ import UIKit
 class DatePickerViewController: UIViewController {
     @IBOutlet weak var fromTextfield: UITextField!
     @IBOutlet weak var toTextfield: UITextField!
+    @IBOutlet weak var fromTitleLabel: UILabel!
+    @IBOutlet weak var toTitleLabel: UILabel!
+    
+    @IBOutlet weak var cancelButton: UIButton!
+    @IBOutlet weak var searchButton: UIButton!
+    
+    struct StringConstants {
+        static let fromPlaceholderText = "Select start date"
+        static let toPlaceholderText = "Select end date"
+        static let cancelButtonText = "Cancel"
+        static let searchButtonText = "Search"
+    }
 
     var completion: ((_ from: String?, _ to: String?) -> ())?
     
@@ -30,13 +42,10 @@ class DatePickerViewController: UIViewController {
     
     override func viewDidLoad() {
         super.viewDidLoad()
-        self.setupToDatePicker()
-        self.setupFromDatePicker()
-        self.fromDatePicker.date = Date()
-        self.handleFromDatePicker(sender: fromDatePicker)
-        // Do any additional setup after loading the view.
+
+        setup()
     }
-    
+
     
     // IBActions
     @IBAction func cancel(_ sender: Any) {
@@ -54,6 +63,24 @@ class DatePickerViewController: UIViewController {
     
     
     // private functions
+    private func setup() {
+        self.setupToDatePicker()
+        self.setupFromDatePicker()
+        self.fromDatePicker.date = Date()
+        self.handleFromDatePicker(sender: fromDatePicker)
+        configureLanguage()
+        // Do any additional setup after loading the view.
+    }
+    
+    func configureLanguage() {
+        self.fromTitleLabel.text = StringConstants.fromPlaceholderText
+        self.toTitleLabel.text = StringConstants.toPlaceholderText
+        self.fromTextfield.text = StringConstants.fromPlaceholderText
+        self.toTextfield.text = StringConstants.toPlaceholderText
+        self.cancelButton.setTitle(StringConstants.cancelButtonText, for: UIControlState.normal)
+        self.searchButton.setTitle(StringConstants.searchButtonText, for: UIControlState.normal)
+    }
+    
     private func setupFromDatePicker() {
         self.fromDatePicker.datePickerMode = .date
         self.fromTextfield.inputView = fromDatePicker
diff --git a/GMERemittance/Module/TransactionHistory/User Interface/View/TransactionHistoryDatePicker.storyboard b/GMERemittance/Module/TransactionHistory/User Interface/View/TransactionHistoryDatePicker.storyboard
index 8db3fb9f..acc26ebe 100644
--- a/GMERemittance/Module/TransactionHistory/User Interface/View/TransactionHistoryDatePicker.storyboard	
+++ b/GMERemittance/Module/TransactionHistory/User Interface/View/TransactionHistoryDatePicker.storyboard	
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
@@ -21,7 +21,7 @@
         <!--Date Picker View Controller-->
         <scene sceneID="iYG-BI-6pQ">
             <objects>
-                <viewController storyboardIdentifier="DatePickerViewController" modalTransitionStyle="crossDissolve" modalPresentationStyle="overCurrentContext" id="d6i-cC-L4t" customClass="DatePickerViewController" customModule="GMERemittance" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="DatePickerViewController" modalTransitionStyle="crossDissolve" modalPresentationStyle="overCurrentContext" id="d6i-cC-L4t" customClass="DatePickerViewController" customModule="GME_Remit" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="bQE-Xw-KV7">
                         <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -145,8 +145,12 @@
                         <viewLayoutGuide key="safeArea" id="OTz-yN-Foh"/>
                     </view>
                     <connections>
+                        <outlet property="cancelButton" destination="d6F-Zw-V5J" id="n49-xz-09u"/>
                         <outlet property="fromTextfield" destination="pCR-cq-obj" id="rgN-1c-pJb"/>
+                        <outlet property="fromTitleLabel" destination="egs-MP-XU0" id="egb-nP-ZmD"/>
+                        <outlet property="searchButton" destination="rgV-Oy-aLC" id="3YQ-4C-iDG"/>
                         <outlet property="toTextfield" destination="I48-21-OzR" id="nBT-06-403"/>
+                        <outlet property="toTitleLabel" destination="8R4-ao-hRh" id="jC2-tY-ZkE"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="FmM-Wk-2zF" userLabel="First Responder" sceneMemberID="firstResponder"/>
diff --git a/GMERemittance/Module/TransactionHistory/User Interface/View/TransactionHistoryViewController.swift b/GMERemittance/Module/TransactionHistory/User Interface/View/TransactionHistoryViewController.swift
index aea2f15b..f0bedb53 100644
--- a/GMERemittance/Module/TransactionHistory/User Interface/View/TransactionHistoryViewController.swift	
+++ b/GMERemittance/Module/TransactionHistory/User Interface/View/TransactionHistoryViewController.swift	
@@ -26,6 +26,14 @@ class TransactionHistoryViewController: UIViewController {
         static let heightOfDateRangeLabel: CGFloat = 35
     }
 
+    struct StringConstants {
+        static let searchPlaceholderText = "Search with Control No..."
+        // see TransactionModelType abobve for more
+//        static let paidText = "paid"
+//        static let allText = "all"
+//        static let unpaid = "unpaid"
+    }
+    
     @IBOutlet weak var fromDateLabel: UILabel!
     @IBOutlet weak var toDateLabel: UILabel!
 
@@ -139,6 +147,7 @@ class TransactionHistoryViewController: UIViewController {
     }
     
     private func setupSearchTextField() {
+        searchTextField.text = StringConstants.searchPlaceholderText
         let imageview = UIImageView(image: #imageLiteral(resourceName: "ic_search"))
         self.searchTextField.leftView = imageview
         self.searchTextField.leftViewMode = .always