diff --git a/Susi.xcodeproj/project.pbxproj b/Susi.xcodeproj/project.pbxproj
index ea7bb959..9a6a0c7d 100644
--- a/Susi.xcodeproj/project.pbxproj
+++ b/Susi.xcodeproj/project.pbxproj
@@ -109,6 +109,8 @@
 		71DF0561EA8079C5C53174C1 /* Pods_Susi.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C564B012515FE5529232089A /* Pods_Susi.framework */; };
 		80183F6F21D170BB00859F72 /* AboutVCMethods.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80183F6E21D170BB00859F72 /* AboutVCMethods.swift */; };
 		807A754421D143A1008D4032 /* AboutViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 807A754321D143A1008D4032 /* AboutViewController.swift */; };
+		80E8C2CE229D2F400086F420 /* AccountViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80E8C2CD229D2F400086F420 /* AccountViewController.swift */; };
+		80E8C2D0229D2F6D0086F420 /* AccountVCMethods.swift in Sources */ = {isa = PBXBuildFile; fileRef = 80E8C2CF229D2F6D0086F420 /* AccountVCMethods.swift */; };
 		94889CA61F7CCD370028B8C3 /* GeneralViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 94889CA51F7CCD370028B8C3 /* GeneralViewController.swift */; };
 		94889CAE1F7CEAA80028B8C3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 94889CB01F7CEAA80028B8C3 /* Localizable.strings */; };
 		A0DEC06E21E0F40300659A5B /* SelectLanguageViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0DEC06D21E0F40300659A5B /* SelectLanguageViewController.swift */; };
@@ -244,6 +246,8 @@
 		6DFC75B81EE077E9002F92BA /* ForgotPasswordViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ForgotPasswordViewController.swift; sourceTree = "<group>"; };
 		80183F6E21D170BB00859F72 /* AboutVCMethods.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutVCMethods.swift; sourceTree = "<group>"; };
 		807A754321D143A1008D4032 /* AboutViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AboutViewController.swift; sourceTree = "<group>"; };
+		80E8C2CD229D2F400086F420 /* AccountViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountViewController.swift; sourceTree = "<group>"; };
+		80E8C2CF229D2F6D0086F420 /* AccountVCMethods.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AccountVCMethods.swift; sourceTree = "<group>"; };
 		94889CA51F7CCD370028B8C3 /* GeneralViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GeneralViewController.swift; sourceTree = "<group>"; };
 		94889CAF1F7CEAA80028B8C3 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = "<group>"; };
 		94889CB11F7CEAAA0028B8C3 /* ru */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ru; path = ru.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -563,6 +567,7 @@
 		6D4D9B501E768F2E0067459C /* Controllers */ = {
 			isa = PBXGroup;
 			children = (
+				80E8C2CC229D2F110086F420 /* AccountViewController */,
 				A0DEC06C21E0F40300659A5B /* SelectLanguageController */,
 				807A754521D1639B008D4032 /* AboutViewController */,
 				406482FE20FCF2EF0014EB47 /* PlayerViewController */,
@@ -685,6 +690,15 @@
 			path = AboutViewController;
 			sourceTree = "<group>";
 		};
+		80E8C2CC229D2F110086F420 /* AccountViewController */ = {
+			isa = PBXGroup;
+			children = (
+				80E8C2CD229D2F400086F420 /* AccountViewController.swift */,
+				80E8C2CF229D2F6D0086F420 /* AccountVCMethods.swift */,
+			);
+			path = AccountViewController;
+			sourceTree = "<group>";
+		};
 		94889CAB1F7CEA620028B8C3 /* Localization */ = {
 			isa = PBXGroup;
 			children = (
@@ -1006,12 +1020,14 @@
 				40623B7F20D243910013FE60 /* Ratings.swift in Sources */,
 				6D395D1D1F58966900BCC3C5 /* SkillDetailExampleCell.swift in Sources */,
 				3BC1D8D5203B177E003E62F9 /* noConnectionViewController.swift in Sources */,
+				80E8C2D0229D2F6D0086F420 /* AccountVCMethods.swift in Sources */,
 				6D395D1F1F589CC000BCC3C5 /* SkillDetailVCMethods.swift in Sources */,
 				94889CA61F7CCD370028B8C3 /* GeneralViewController.swift in Sources */,
 				6DEE71121F2C9DC900A512CF /* AppNavigationController.swift in Sources */,
 				80183F6F21D170BB00859F72 /* AboutVCMethods.swift in Sources */,
 				40801EE320F33B4C0071860E /* VideoPlayerView.swift in Sources */,
 				6DE0025B1F3FF93A0065DB85 /* AnchorCell.swift in Sources */,
+				80E8C2CE229D2F400086F420 /* AccountViewController.swift in Sources */,
 				6D24B0961EE409DB0097418A /* SignUpVCMethods.swift in Sources */,
 				40DE743920E49F3A003C0116 /* AllFeedbackViewController.swift in Sources */,
 				407EFAC020C34C0000675A0B /* LanguagePickerController.swift in Sources */,
diff --git a/Susi/Controllers/AccountViewController/AccountVCMethods.swift b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
new file mode 100644
index 00000000..02332593
--- /dev/null
+++ b/Susi/Controllers/AccountViewController/AccountVCMethods.swift
@@ -0,0 +1,127 @@
+//
+//  AccountVCMethods.swift
+//  Susi
+//
+//  Created by Syed on 28/05/19.
+//  Copyright © 2019 FOSSAsia. All rights reserved.
+//
+
+import Foundation
+
+extension AccountViewController: UITextFieldDelegate {
+    
+    @objc func dismissView() {
+        self.dismiss(animated: true, completion: nil)
+    }
+    
+    func setupTitle() {
+        navigationItem.titleLabel.text = ControllerConstants.SettingParams.title
+        navigationItem.titleLabel.textAlignment = .left
+        navigationItem.titleLabel.textColor = .white
+        navigationItem.leftViews = [backButton]
+        navigationItem.rightViews = [settingsButton]
+        deleteAccountButton.tintColor = .red
+    }
+    
+    func setUpUserDetails() {
+        if let user = delegate?.currentUser {
+            let imageURL = URL(string: SettingsViewController.getAvatarPath(user.accessToken) )
+            userAvatarImageView.kf.setImage(with: imageURL)
+            if UserDefaults.standard.object(forKey: ControllerConstants.SettingParams.userName) == nil {
+                userEmailLabel.text = user.emailID
+            } else {
+                userEmailLabel.text = UserDefaults.standard.object(forKey: ControllerConstants.SettingParams.userName) as? String
+            }
+            roundedCorner()
+            outerViewShadow()
+        }
+    }
+    
+    func roundedCorner() {
+        userAvatarImageView.layer.cornerRadius = 38.0
+        userAvatarImageView.layer.borderWidth = 1.0
+        userAvatarImageView.layer.borderColor = UIColor.white.cgColor
+        userAvatarImageView.layer.masksToBounds = true
+        userAvatarImageView.clipsToBounds = true
+    }
+    
+    // Outer View
+    
+    func outerViewShadow() {
+        outerView.layer.cornerRadius = 38.0
+        outerView.layer.shadowColor = UIColor.gray.cgColor
+        outerView.layer.shadowOpacity = 1
+        outerView.layer.shadowRadius = 10.0
+        outerView.layer.shadowOffset = CGSize.zero
+    }
+    
+    // Setting Action 
+    
+   @objc func settingButtonClicked() {
+    if  let user = delegate?.currentUser {
+        let param = [
+            ControllerConstants.SettingParams.userName: userNameTextField.text as AnyObject,
+            ControllerConstants.SettingParams.phoneNumber: phoneNumberTextField.text as AnyObject,
+            ControllerConstants.SettingParams.prefLanguage: prefLanguageTextField.text as AnyObject,
+            ControllerConstants.SettingParams.count: 3 as AnyObject,
+            ControllerConstants.SettingParams.accessToken: user.accessToken as AnyObject
+        ]
+        Client.sharedInstance.changeUserSettings(param) { (_, message) in
+            DispatchQueue.main.async {
+                UserDefaults.standard.set(self.userNameTextField.text, forKey: ControllerConstants.SettingParams.userName)
+                self.view.makeToast(message)
+            }
+        }
+    }
+    }
+    
+    // Key Return on Hit
+    
+    func textFieldShouldReturn(_ textField: UITextField) -> Bool {
+        switch textField {
+        case userNameTextField:
+            _ =  phoneNumberTextField.becomeFirstResponder()
+        case phoneNumberTextField:
+            dismissKeyboard()        default:
+            textField.resignFirstResponder()
+        }
+        return true
+    }
+    
+    // Dismiss Keyboard
+    
+    @objc func dismissKeyboard() {
+        view.endEditing(true)
+    }
+    
+    // Add Delegates
+    
+    func addDelegates() {
+        userNameTextField.delegate = self
+        phoneNumberTextField.delegate = self
+        picker.dataSource = self
+        picker.delegate = self
+        prefLanguageTextField.inputView = picker
+    }
+    
+    // Handle Delete Account Request.
+    
+    func handleDeleteAccountRequest() {
+        deleteAccountButton.addTarget(self, action: #selector(deleteAccount), for: .touchUpInside)
+    }
+    
+    @objc func deleteAccount() {
+        
+    }
+    
+    // Handle Upload Avatar
+    
+    func handleAvatarUpload() {
+        uploadAvatarButton.addTarget(self, action: #selector(uploadAvatar), for: .touchUpInside)
+    }
+    
+    @objc func uploadAvatar() {
+    
+    }
+    
+}
diff --git a/Susi/Controllers/AccountViewController/AccountViewController.swift b/Susi/Controllers/AccountViewController/AccountViewController.swift
new file mode 100644
index 00000000..b00fd541
--- /dev/null
+++ b/Susi/Controllers/AccountViewController/AccountViewController.swift
@@ -0,0 +1,73 @@
+//
+//  AccountViewController.swift
+//  Susi
+//
+//  Created by Syed on 28/05/19.
+//  Copyright © 2019 FOSSAsia. All rights reserved.
+//
+
+import UIKit
+import Material
+
+class AccountViewController: UIViewController, UIPickerViewDataSource, UIPickerViewDelegate {
+    
+    
+    let delegate = UIApplication.shared.delegate as? AppDelegate
+    
+    lazy var backButton: IconButton = {
+        let ib = IconButton()
+        ib.image = Icon.cm.arrowBack
+        ib.tintColor = .white
+        ib.addTarget(self, action: #selector(dismissView), for: .touchUpInside)
+        return ib
+    }()
+    
+    lazy var settingsButton: IconButton = {
+        let ib = IconButton()
+        ib.image = Icon.check
+        ib.tintColor = .white
+        ib.layer.cornerRadius = 18.0
+        ib.addTarget(self, action: #selector(settingButtonClicked), for: .touchUpInside)
+        return ib
+    }()
+   
+    var picker = UIPickerView()
+    
+    var preferredLanguage = ["Armenian (am-AM)","Chinese (zh-CH)","Deutsch (de-DE)"," Greek (gr-GR)","Hindi (hi-IN) ","Punjabi (pb-IN)","Nepali (np-NP)","Russian (ru-RU)","Spanish (es-SP)","French (fr-FR)","apanese (jp-JP) ","Dutch (nl-NL)","US Eng (en-US)"]
+
+    @IBOutlet weak var outerView: UIView!
+    @IBOutlet weak var uploadAvatarButton: UIButton!
+    @IBOutlet weak var deleteAccountButton: UIButton!
+    @IBOutlet weak var prefLanguageTextField: TextField!
+    @IBOutlet weak var phoneNumberTextField: TextField!
+    @IBOutlet weak var userNameTextField: TextField!
+    @IBOutlet weak var userEmailLabel: UILabel!
+    @IBOutlet weak var userAvatarImageView: UIImageView!
+    
+    override func viewDidLoad() {
+        super.viewDidLoad()
+        setupTitle()
+        setUpUserDetails()
+        addDelegates()
+    }
+    
+    //UIPickerView Deledate Functions
+    
+    func numberOfComponents(in pickerView: UIPickerView) -> Int {
+        return 1
+    }
+    
+    func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
+        return preferredLanguage.count
+    }
+    
+    func pickerView(_ pickerView: UIPickerView, titleForRow row: Int, forComponent component: Int) -> String? {
+        return preferredLanguage[row]
+    }
+
+    func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int, inComponent component: Int) {
+        prefLanguageTextField.text = preferredLanguage[row]
+        self.view.endEditing(false)
+    }
+
+}
diff --git a/Susi/Controllers/SettingsController/SettingsVCMethods.swift b/Susi/Controllers/SettingsController/SettingsVCMethods.swift
index af79863b..c4ec6a01 100644
--- a/Susi/Controllers/SettingsController/SettingsVCMethods.swift
+++ b/Susi/Controllers/SettingsController/SettingsVCMethods.swift
@@ -120,6 +120,15 @@ extension SettingsViewController {
         let nvc = AppNavigationController(rootViewController: vc)
         present(nvc, animated: true, completion: nil)
     }
+    
+    // Present Account View Controller
+    
+    func presentAccountController() {
+        let mainStoryboard = UIStoryboard(name: "Main", bundle: nil)
+        let vc = mainStoryboard.instantiateViewController(withIdentifier: "AccountViewController")
+        let nvc = AppNavigationController(rootViewController: vc)
+        present(nvc, animated: true, completion: nil)
+    }
 
     func presentDeviceActivity() {
         if let delegate = UIApplication.shared.delegate as? AppDelegate, delegate.currentUser != nil {
diff --git a/Susi/Controllers/SettingsController/SettingsViewController.swift b/Susi/Controllers/SettingsController/SettingsViewController.swift
index dacb2f3d..d027439a 100644
--- a/Susi/Controllers/SettingsController/SettingsViewController.swift
+++ b/Susi/Controllers/SettingsController/SettingsViewController.swift
@@ -134,7 +134,7 @@ class SettingsViewController: UITableViewController {
             if user == nil {
                 presentLoginScreen()
             } else {
-                // Will Connect to the Account Section.
+                presentAccountController()
             }
             } else if row == 1 {
                 presentResetPasswordController()
@@ -176,10 +176,14 @@ class SettingsViewController: UITableViewController {
             if indexPath.section == 6 && indexPath.row == 0 {
                 let imageURL = URL(string: SettingsViewController.getAvatarPath((user?.accessToken)!) )
                 userImage.kf.setImage(with: imageURL)
-                userEmailTitle.text = user?.emailID
+                if UserDefaults.standard.object(forKey: ControllerConstants.SettingParams.userName) == nil {
+                    userEmailTitle.text = user?.emailID
+                } else {
+                    userEmailTitle.text = UserDefaults.standard.object(forKey: ControllerConstants.SettingParams.userName) as? String
+                }
                 roundedCorner()
                 //Since account VC not available so, cell should be inactive
-                cell.isUserInteractionEnabled = false
+                cell.isUserInteractionEnabled = true
             }
         }
     }
diff --git a/Susi/Helpers/ControllerConstants.swift b/Susi/Helpers/ControllerConstants.swift
index 39cad6fd..52e264d5 100644
--- a/Susi/Helpers/ControllerConstants.swift
+++ b/Susi/Helpers/ControllerConstants.swift
@@ -315,6 +315,16 @@ class ControllerConstants {
         static let unBookmarkSuccessMessage = "Bookmark Removed Successfully"
     }
     
+    struct SettingParams {
+        static let userName = "userName"
+        static let phoneNumber = "phoneNo"
+        static let prefLanguage = "prefLanguage"
+        static let timeZone = "timeZone"
+        static let accessToken = "access_token"
+        static let count = "count"
+        static let title = "Account Settings"
+    }
+    
 }
 
 
diff --git a/Susi/Storyboards/Main.storyboard b/Susi/Storyboards/Main.storyboard
index e8ad457c..ed609632 100644
--- a/Susi/Storyboards/Main.storyboard
+++ b/Susi/Storyboards/Main.storyboard
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="0ek-IO-lKt">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="14490.70" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="0ek-IO-lKt">
     <device id="retina5_9" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14490.49"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
@@ -320,7 +320,7 @@
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="fZv-XU-9rZ" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="16" y="141" width="343" height="30"/>
+                                <rect key="frame" x="16" y="93" width="343" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="email"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -338,7 +338,7 @@
                                 </connections>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="N3z-41-ZBS" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="16" y="215" width="343" height="30"/>
+                                <rect key="frame" x="16" y="167" width="343" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="password"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -353,7 +353,7 @@
                                 </connections>
                             </textField>
                             <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="TcY-GF-sf2" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="16" y="289" width="343" height="30"/>
+                                <rect key="frame" x="16" y="241" width="343" height="30"/>
                                 <accessibility key="accessibilityConfiguration" identifier="confirmPassword"/>
                                 <nil key="textColor"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -368,7 +368,7 @@
                                 </connections>
                             </textField>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="diq-Fb-8ST" customClass="RaisedButton" customModule="Material">
-                                <rect key="frame" x="16" y="395" width="343" height="44"/>
+                                <rect key="frame" x="16" y="347" width="343" height="44"/>
                                 <color key="backgroundColor" red="0.99999600649999998" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                 <accessibility key="accessibilityConfiguration" identifier="signUp"/>
                                 <constraints>
@@ -379,7 +379,7 @@
                                 </state>
                             </button>
                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jll-vc-Hx1">
-                                <rect key="frame" x="6" y="44" width="72" height="72"/>
+                                <rect key="frame" x="6" y="44" width="24" height="24"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <state key="normal" image="back_arrow"/>
                                 <connections>
@@ -387,7 +387,7 @@
                                 </connections>
                             </button>
                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mlz-rv-BcH" customClass="M13Checkbox" customModule="M13Checkbox">
-                                <rect key="frame" x="16" y="349" width="24" height="24"/>
+                                <rect key="frame" x="16" y="301" width="24" height="24"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
                                 <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                 <constraints>
@@ -418,7 +418,7 @@
                                 </connections>
                             </view>
                             <textField opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="j46-3i-Hj3" customClass="TextField" customModule="Material">
-                                <rect key="frame" x="48" y="345" width="311" height="30"/>
+                                <rect key="frame" x="48" y="297" width="311" height="30"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="30" id="4PP-I0-LPd"/>
                                     <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="30" id="sZd-Mv-gyk"/>
@@ -442,7 +442,7 @@
                                 </state>
                             </button>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="8w1-Me-Ajd">
-                                <rect key="frame" x="142" y="456" width="92" height="37"/>
+                                <rect key="frame" x="142" y="408" width="92" height="37"/>
                             </activityIndicatorView>
                         </subviews>
                         <color key="backgroundColor" name="iOSBlue"/>
@@ -532,40 +532,40 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="manual_record" translatesAutoresizingMaskIntoConstraints="NO" id="2xw-vb-Rd9">
-                                <rect key="frame" x="32" y="303" width="72" height="72"/>
+                                <rect key="frame" x="32" y="303" width="24" height="24.333333333333314"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </imageView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Listening... say &quot;SUSI&quot;" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ZFw-Ph-8b4">
-                                <rect key="frame" x="127" y="305" width="216" height="68"/>
+                                <rect key="frame" x="79" y="305" width="264" height="20.333333333333314"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="MkY-mN-xiY">
-                                <rect key="frame" x="34" y="305" width="68" height="20"/>
+                                <rect key="frame" x="34" y="305" width="20" height="20"/>
                             </activityIndicatorView>
                             <imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="manual_record" translatesAutoresizingMaskIntoConstraints="NO" id="bWp-VC-efB">
-                                <rect key="frame" x="32" y="395" width="72" height="72"/>
+                                <rect key="frame" x="32" y="347.33333333333331" width="24" height="24"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </imageView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Say &quot;SUSI&quot; again" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cbj-q3-I0O">
-                                <rect key="frame" x="127" y="397" width="216" height="21"/>
+                                <rect key="frame" x="79" y="349.33333333333331" width="264" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="kU6-Vs-OHY">
-                                <rect key="frame" x="34" y="397" width="68" height="20"/>
+                                <rect key="frame" x="34" y="349.33333333333331" width="20" height="20"/>
                             </activityIndicatorView>
                             <imageView clearsContextBeforeDrawing="NO" userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="manual_record" translatesAutoresizingMaskIntoConstraints="NO" id="FIR-6f-0Z4">
-                                <rect key="frame" x="32" y="487" width="72" height="72"/>
+                                <rect key="frame" x="32" y="391.33333333333331" width="24" height="24"/>
                                 <color key="tintColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                             </imageView>
                             <activityIndicatorView hidden="YES" opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" style="gray" translatesAutoresizingMaskIntoConstraints="NO" id="grs-I7-eRe">
-                                <rect key="frame" x="34" y="489" width="68" height="20"/>
+                                <rect key="frame" x="34" y="393.33333333333331" width="20" height="20"/>
                             </activityIndicatorView>
                             <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Say &quot;SUSI&quot; one last time" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tIR-x8-YXs">
-                                <rect key="frame" x="127" y="442" width="216" height="21"/>
+                                <rect key="frame" x="79" y="394.33333333333331" width="264" height="21"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
@@ -3032,6 +3032,151 @@
             </objects>
             <point key="canvasLocation" x="6133.6000000000004" y="1053.6945812807883"/>
         </scene>
+        <!--AccountViewController-->
+        <scene sceneID="uQf-Tn-w11">
+            <objects>
+                <viewController storyboardIdentifier="AccountViewController" title="AccountViewController" id="w3l-fA-aNI" customClass="AccountViewController" customModule="Susi" customModuleProvider="target" sceneMemberID="viewController">
+                    <layoutGuides>
+                        <viewControllerLayoutGuide type="top" id="s4X-I3-Ota"/>
+                        <viewControllerLayoutGuide type="bottom" id="5TP-3Y-DYm"/>
+                    </layoutGuides>
+                    <view key="view" contentMode="scaleToFill" id="VEn-23-95H">
+                        <rect key="frame" x="0.0" y="0.0" width="375" height="812"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Email/Username" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="O82-y1-J3Q">
+                                <rect key="frame" x="16" y="143" width="343" height="21"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="343" id="5gL-K3-dLf"/>
+                                    <constraint firstAttribute="height" constant="21" id="erT-Ns-pgN"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="N1Y-Sg-WGK" userLabel="Image View">
+                                <rect key="frame" x="150" y="60" width="75" height="75"/>
+                                <subviews>
+                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="placeholder" translatesAutoresizingMaskIntoConstraints="NO" id="DVV-HK-CkK">
+                                        <rect key="frame" x="0.0" y="0.0" width="75" height="75"/>
+                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                    </imageView>
+                                </subviews>
+                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="75" id="Hal-Id-kHN"/>
+                                    <constraint firstAttribute="width" constant="75" id="sCC-GX-Xgb"/>
+                                </constraints>
+                            </view>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Account Settings" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="0ke-4f-wNK">
+                                <rect key="frame" x="16" y="199" width="343" height="21"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="21" id="Ed9-yJ-g34"/>
+                                    <constraint firstAttribute="width" constant="343" id="nBQ-NM-iOr"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="boldSystem" pointSize="18"/>
+                                <nil key="textColor"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Hew-9F-nQq" customClass="TextField" customModule="Material">
+                                <rect key="frame" x="16" y="267" width="343" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="KkV-Dp-oDF"/>
+                                    <constraint firstAttribute="width" constant="343" id="cXP-Lm-FSY"/>
+                                </constraints>
+                                <nil key="textColor"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="User Name"/>
+                                </userDefinedRuntimeAttributes>
+                            </textField>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="kJQ-WH-5Y2" customClass="TextField" customModule="Material">
+                                <rect key="frame" x="16" y="330" width="343" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="343" id="dLp-7B-NYD"/>
+                                    <constraint firstAttribute="height" constant="30" id="gJV-hZ-AIY"/>
+                                </constraints>
+                                <nil key="textColor"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits" keyboardType="phonePad"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Phone Number"/>
+                                </userDefinedRuntimeAttributes>
+                            </textField>
+                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Q0f-nA-mYs" customClass="TextField" customModule="Material">
+                                <rect key="frame" x="16" y="391" width="343" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="Fa8-V2-fjf"/>
+                                    <constraint firstAttribute="width" constant="343" id="p9r-YJ-vGC"/>
+                                </constraints>
+                                <nil key="textColor"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                <textInputTraits key="textInputTraits"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="string" keyPath="placeholder" value="Preferred Language"/>
+                                </userDefinedRuntimeAttributes>
+                            </textField>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="jRb-ll-29A">
+                                <rect key="frame" x="16" y="439" width="343" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="343" id="7yU-Dn-qmT"/>
+                                    <constraint firstAttribute="height" constant="30" id="XHZ-Mt-nps"/>
+                                </constraints>
+                                <state key="normal" title="Click here to delete account"/>
+                            </button>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="leading" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="8FB-uS-h3d">
+                                <rect key="frame" x="16" y="470" width="343" height="30"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="30" id="0CL-NG-Lsj"/>
+                                    <constraint firstAttribute="width" constant="343" id="woE-UW-CBb"/>
+                                </constraints>
+                                <state key="normal" title="Click here to upload image"/>
+                            </button>
+                        </subviews>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="kJQ-WH-5Y2" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="2f4-jb-kDm"/>
+                            <constraint firstItem="0ke-4f-wNK" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="3Gf-qD-ewe"/>
+                            <constraint firstItem="jRb-ll-29A" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="7Hq-et-KK1"/>
+                            <constraint firstItem="O82-y1-J3Q" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="8Af-Dd-abe"/>
+                            <constraint firstItem="Hew-9F-nQq" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="B1o-Hs-J21"/>
+                            <constraint firstItem="N1Y-Sg-WGK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" constant="134" id="Ef8-vf-aG6"/>
+                            <constraint firstItem="N1Y-Sg-WGK" firstAttribute="top" secondItem="s4X-I3-Ota" secondAttribute="bottom" constant="16" id="IXC-8Y-VEg"/>
+                            <constraint firstItem="8FB-uS-h3d" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="M4z-zQ-caj"/>
+                            <constraint firstItem="Q0f-nA-mYs" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="QbU-hG-kAm"/>
+                            <constraint firstItem="jRb-ll-29A" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="Qck-Xl-eZ2"/>
+                            <constraint firstItem="Hew-9F-nQq" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="SPl-ve-eUV"/>
+                            <constraint firstItem="8FB-uS-h3d" firstAttribute="top" secondItem="jRb-ll-29A" secondAttribute="bottom" constant="1" id="SnP-yl-4Ng"/>
+                            <constraint firstItem="Hew-9F-nQq" firstAttribute="top" secondItem="0ke-4f-wNK" secondAttribute="bottom" constant="47" id="ZRM-ID-aXg"/>
+                            <constraint firstItem="Q0f-nA-mYs" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="eGw-0Q-cm7"/>
+                            <constraint firstItem="Q0f-nA-mYs" firstAttribute="top" secondItem="kJQ-WH-5Y2" secondAttribute="bottom" constant="31" id="eTI-H4-dMZ"/>
+                            <constraint firstItem="O82-y1-J3Q" firstAttribute="top" secondItem="N1Y-Sg-WGK" secondAttribute="bottom" constant="8" id="g9Z-JF-SyW"/>
+                            <constraint firstItem="jRb-ll-29A" firstAttribute="top" secondItem="Q0f-nA-mYs" secondAttribute="bottom" constant="18" id="kaM-Rg-NDO"/>
+                            <constraint firstAttribute="trailingMargin" secondItem="N1Y-Sg-WGK" secondAttribute="trailing" constant="134" id="kkZ-JL-tVn"/>
+                            <constraint firstItem="0ke-4f-wNK" firstAttribute="top" secondItem="O82-y1-J3Q" secondAttribute="bottom" constant="35" id="lOU-sE-lrq"/>
+                            <constraint firstItem="0ke-4f-wNK" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="mkx-gN-gF1"/>
+                            <constraint firstItem="kJQ-WH-5Y2" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="npA-oh-ait"/>
+                            <constraint firstItem="kJQ-WH-5Y2" firstAttribute="top" secondItem="Hew-9F-nQq" secondAttribute="bottom" constant="33" id="rv3-Se-PLs"/>
+                            <constraint firstItem="O82-y1-J3Q" firstAttribute="trailing" secondItem="VEn-23-95H" secondAttribute="trailingMargin" id="wbJ-Xv-nUB"/>
+                            <constraint firstItem="8FB-uS-h3d" firstAttribute="leading" secondItem="VEn-23-95H" secondAttribute="leadingMargin" id="wbt-e9-508"/>
+                        </constraints>
+                    </view>
+                    <connections>
+                        <outlet property="deleteAccountButton" destination="jRb-ll-29A" id="nKy-kj-X6x"/>
+                        <outlet property="outerView" destination="N1Y-Sg-WGK" id="H4y-SO-HmP"/>
+                        <outlet property="phoneNumberTextField" destination="kJQ-WH-5Y2" id="CAK-9e-uvr"/>
+                        <outlet property="prefLanguageTextField" destination="Q0f-nA-mYs" id="e66-Sd-U26"/>
+                        <outlet property="uploadAvatarButton" destination="8FB-uS-h3d" id="1GW-wV-ff3"/>
+                        <outlet property="userAvatarImageView" destination="DVV-HK-CkK" id="ivv-Kd-eR3"/>
+                        <outlet property="userEmailLabel" destination="O82-y1-J3Q" id="VKk-K1-3xn"/>
+                        <outlet property="userNameTextField" destination="Hew-9F-nQq" id="DkX-BH-69n"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="9mY-xY-v4Q" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="7152.8000000000002" y="1063.3004926108374"/>
+        </scene>
         <!--Navigation Controller-->
         <scene sceneID="g15-3o-WgW">
             <objects>
@@ -3101,11 +3246,11 @@
         </scene>
     </scenes>
     <resources>
-        <image name="back_arrow" width="72" height="72"/>
+        <image name="back_arrow" width="24" height="24"/>
         <image name="mail-icon" width="80" height="64"/>
-        <image name="manual_record" width="72" height="72"/>
+        <image name="manual_record" width="24" height="24"/>
         <image name="placeholder" width="800" height="600"/>
-        <image name="record" width="300" height="300"/>
+        <image name="record" width="100" height="100"/>
         <image name="star_empty" width="22" height="22"/>
         <image name="star_full" width="22" height="22"/>
         <image name="star_full_gray" width="12" height="12"/>