diff --git a/Application/To-Do.xcodeproj/project.pbxproj b/Application/To-Do.xcodeproj/project.pbxproj
index 0010993..e6b32ea 100644
--- a/Application/To-Do.xcodeproj/project.pbxproj
+++ b/Application/To-Do.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0119C5DC25F2DB580082A4E6 /* TaskDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BBE55C825245DBF00090F87 /* TaskDetailsViewController.swift */; };
 		07F46C8525277C7E007DC6AC /* SortTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 07F46C8425277C7E007DC6AC /* SortTypes.swift */; };
 		3307EC692537AFB100963CC4 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3307EC682537AFB100963CC4 /* Extensions.swift */; };
 		4F953E502531C25E0027144C /* EmptyState.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F953E4F2531C25E0027144C /* EmptyState.swift */; };
@@ -17,7 +18,6 @@
 		5BBE55AA2523A42C00090F87 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5BBE55A92523A42C00090F87 /* Assets.xcassets */; };
 		5BBE55AD2523A42C00090F87 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 5BBE55AB2523A42C00090F87 /* LaunchScreen.storyboard */; };
 		5BBE55B72523A90A00090F87 /* TodoViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BBE55B62523A90A00090F87 /* TodoViewController.swift */; };
-		5BBE55C925245DBF00090F87 /* TaskDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BBE55C825245DBF00090F87 /* TaskDetailsViewController.swift */; };
 		5BBE55CB2524623900090F87 /* TextviewBorder.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BBE55CA2524623900090F87 /* TextviewBorder.swift */; };
 		5BC2F07B2532D10F00B648C2 /* Constants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5BC2F07A2532D10F00B648C2 /* Constants.swift */; };
 		603B4C66252647BD00579EC6 /* ResultsTableController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 603B4C65252647BD00579EC6 /* ResultsTableController.swift */; };
@@ -289,13 +289,13 @@
 				E924B484252D53F3004FD116 /* CameraHelper.swift in Sources */,
 				5BBE559E2523A42700090F87 /* AppDelegate.swift in Sources */,
 				5BBE55A02523A42700090F87 /* SceneDelegate.swift in Sources */,
+				0119C5DC25F2DB580082A4E6 /* TaskDetailsViewController.swift in Sources */,
 				5BBE55A82523A42700090F87 /* To_Do.xcdatamodeld in Sources */,
 				5BC2F07B2532D10F00B648C2 /* Constants.swift in Sources */,
 				5BBE55CB2524623900090F87 /* TextviewBorder.swift in Sources */,
 				E924B487252D63FE004FD116 /* ImageAttachmentCell.swift in Sources */,
 				603B4C66252647BD00579EC6 /* ResultsTableController.swift in Sources */,
 				8E6209BD25291AF0004CE4B9 /* OnboardingViewController.swift in Sources */,
-				5BBE55C925245DBF00090F87 /* TaskDetailsViewController.swift in Sources */,
 				FF2303B42529183700B88831 /* Alert.swift in Sources */,
 				3307EC692537AFB100963CC4 /* Extensions.swift in Sources */,
 				FFA6683A2530E07F004E1DE3 /* TaskHistoryViewController.swift in Sources */,
@@ -460,7 +460,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = F8CHS6PHQS;
+				DEVELOPMENT_TEAM = HER732L49Q;
 				ENABLE_TESTABILITY = YES;
 				INFOPLIST_FILE = "To-Do/Helpers/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
@@ -480,7 +480,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = F8CHS6PHQS;
+				DEVELOPMENT_TEAM = HER732L49Q;
 				ENABLE_TESTABILITY = YES;
 				INFOPLIST_FILE = "To-Do/Helpers/Info.plist";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.2;
diff --git a/Application/To-Do/Controller/TaskDetailsViewController.swift b/Application/To-Do/Controller/TaskDetailsViewController.swift
index 2e245f0..4609eeb 100644
--- a/Application/To-Do/Controller/TaskDetailsViewController.swift
+++ b/Application/To-Do/Controller/TaskDetailsViewController.swift
@@ -16,11 +16,113 @@ protocol TaskDelegate: class {
 class TaskDetailsViewController: UIViewController{
     
     // OUTLETS
-    @IBOutlet private weak var taskTitleTextField: UITextField!
-    @IBOutlet private weak var subTasksTextView: UITextView!
-    @IBOutlet private weak var endDateTextField: UITextField!
-    @IBOutlet private weak var saveButton: UIBarButtonItem!
-    @IBOutlet private weak var attachmentCollection: UICollectionView!
+    //    @IBOutlet private weak var taskTitleTextField: UITextField!
+    //    @IBOutlet private weak var subTasksTextView: UITextView!
+    //    @IBOutlet private weak var endDateTextField: UITextField!
+    //    @IBOutlet private weak var saveButton: UIBarButtonItem!
+    //    @IBOutlet private weak var attachmentCollection: UICollectionView!
+    
+    
+    
+    // UI Elements
+    let taskLabel: UILabel = {
+        let l = UILabel()
+        l.translatesAutoresizingMaskIntoConstraints = false
+        l.text = "Task"
+        l.font = UIFont.systemFont(ofSize: 20, weight: .semibold)
+        
+        return l
+    }()
+    
+    let taskTitleTextField: UITextField = {
+        let tf = UITextField()
+        tf.translatesAutoresizingMaskIntoConstraints = false
+        tf.placeholder = "Enter task name"
+        tf.layer.borderWidth = 0.5
+        tf.layer.borderColor = UIColor.systemGray.cgColor
+        tf.layer.cornerRadius = 5
+        
+        
+        return tf
+    }()
+    
+    
+    let subtasksLabel: UILabel = {
+        let l = UILabel()
+        l.translatesAutoresizingMaskIntoConstraints = false
+        l.text = "Sub Tasks"
+        l.font = UIFont.systemFont(ofSize: 20, weight: .semibold)
+        
+        return l
+    }()
+    
+    let subTasksTextView: UITextView = {
+        let tv = UITextView()
+        tv.translatesAutoresizingMaskIntoConstraints = false
+        tv.backgroundColor = .secondarySystemGroupedBackground
+        tv.text = "Enter your subtask here"
+        tv.layer.cornerRadius = 5
+        tv.layer.borderColor = UIColor.systemGray.cgColor
+        tv.layer.borderWidth = 0.5
+        
+        return tv
+    }()
+    
+    let endDateLabel: UILabel = {
+        let l = UILabel()
+        l.translatesAutoresizingMaskIntoConstraints = false
+        l.text = "End Date"
+        l.font = UIFont.systemFont(ofSize: 20, weight: .semibold)
+        
+        
+        return l
+    }()
+    
+    let endDateTextField: UITextField = {
+        let tf = UITextField()
+        tf.translatesAutoresizingMaskIntoConstraints = false
+        tf.placeholder = "Select end date"
+        tf.layer.borderWidth = 0.5
+        tf.layer.borderColor = UIColor.systemGray.cgColor
+        tf.layer.cornerRadius = 5
+        
+        
+        return tf
+    }()
+    
+    let imageLabel: UILabel = {
+        let l = UILabel()
+        l.translatesAutoresizingMaskIntoConstraints = false
+        l.text = "Image attachments"
+        l.font = UIFont.systemFont(ofSize: 20, weight: .semibold)
+        
+        
+        return l
+    }()
+    
+    let addImageButton: UIButton = {
+        let b = UIButton()
+        b.translatesAutoresizingMaskIntoConstraints = false
+        b.setTitle("Add image", for: .normal)
+        b.setTitleColor(.systemBlue, for: .normal)
+        b.titleLabel?.font = UIFont.systemFont(ofSize: 15, weight: .regular)
+        b.addTarget(self, action: #selector(addPhotoTapped), for: .touchUpInside)
+        
+        return b
+    }()
+    
+    
+    let attachmentCollection: UICollectionView = {
+        let viewLayout = UICollectionViewFlowLayout()
+        let collectionView = UICollectionView(frame: .zero, collectionViewLayout: viewLayout)
+        collectionView.translatesAutoresizingMaskIntoConstraints = false
+        collectionView.register(ImageAttachmentCell.self, forCellWithReuseIdentifier: ImageAttachmentCell.identifier)
+        
+        
+        
+        return collectionView
+    }()
+    
     
     
     // VARIABLES
@@ -36,11 +138,27 @@ class TaskDetailsViewController: UIViewController{
     var cameraHelper = CameraHelper()
     
     var hapticGenerator: UINotificationFeedbackGenerator? = nil
-
+    
+    
+    
     override func viewDidLoad() {
         super.viewDidLoad()
+        
+        attachmentCollection.dataSource = self
+        attachmentCollection.delegate = self
+
+        
+        // programmatically add the savebutton to the right bar button item
+        let saveButton = UIBarButtonItem(title: "Save", style: .done, target: self, action: #selector(saveTapped(_:)))
+        navigationItem.rightBarButtonItem = saveButton
+        
+        setupUI()
+        
         isUpdate = (task != nil)
-        endDatePicker = UIDatePicker()
+//        endDatePicker = UIDatePicker()
+        endDatePicker = UIDatePicker.init(frame: CGRect(x: 0, y: 0, width: view.bounds.size.width, height: 150))
+        endDatePicker.contentHorizontalAlignment = .fill
+
         endDatePicker.addTarget(self, action: #selector(didPickDate(_:)), for: .valueChanged)
         endDatePicker.minimumDate = Date()
         endDateTextField.inputView = endDatePicker
@@ -48,27 +166,133 @@ class TaskDetailsViewController: UIViewController{
         subTasksTextView.addBorder()
         loadTaskForUpdate()
         taskTitleTextField.delegate = self
-        // Tap outside to close the keybord
+        // Tap outside to close the keyboard
         let tap = UITapGestureRecognizer(target: self.view, action: #selector(UIView.endEditing))
         view.addGestureRecognizer(tap)
         saveButton.title = isUpdate ? Constants.Action.update : Constants.Action.add
     }
     
-    @IBAction func addImageAttachment(_ sender: Any) {
-        // opening camera
-        cameraHelper.openCamera(in: self) { [weak self] image in
-            guard let image = image else { return }
+    // adding and constraining UI elements
+    func setupUI() {
+        
+        
+        
+        self.view.addSubview(taskLabel)
+        NSLayoutConstraint.activate([
+            taskLabel.topAnchor.constraint(equalTo: self.view.safeAreaLayoutGuide.topAnchor, constant: -30),
+            taskLabel.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 20),
+            taskLabel.widthAnchor.constraint(equalToConstant: self.view.frame.width/2)
+            
+            
+            
+        ])
+        
+        self.view.addSubview(taskTitleTextField)
+        NSLayoutConstraint.activate([
+            taskTitleTextField.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 20),
+            taskTitleTextField.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -20),
+            taskTitleTextField.topAnchor.constraint(equalTo: taskLabel.bottomAnchor, constant: 15),
+            taskTitleTextField.heightAnchor.constraint(equalToConstant: self.view.frame.height*0.05),
             
-            // Adding attachment
+        ])
+        
+        self.view.addSubview(subtasksLabel)
+        NSLayoutConstraint.activate([
+            subtasksLabel.topAnchor.constraint(equalTo: taskTitleTextField.bottomAnchor, constant: 30),
+            subtasksLabel.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 20),
+            subtasksLabel.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -20)
+            
+        ])
+        
+        self.view.addSubview(subTasksTextView)
+        NSLayoutConstraint.activate([
+            subTasksTextView.topAnchor.constraint(equalTo: subtasksLabel.bottomAnchor, constant: 8),
+            subTasksTextView.heightAnchor.constraint(equalTo: self.view.heightAnchor, multiplier: 0.1428),
+            subTasksTextView.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 20),
+            subTasksTextView.widthAnchor.constraint(equalTo: self.view.widthAnchor, multiplier: 0.80 )
+            
+            
+        ])
+        
+        self.view.addSubview(endDateLabel)
+        NSLayoutConstraint.activate([
+            endDateLabel.topAnchor.constraint(equalTo: subTasksTextView.bottomAnchor, constant: 20 ),
+            endDateLabel.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 20),
+            endDateLabel.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -20)
+            
+        ])
+        
+        self.view.addSubview(endDateTextField)
+        NSLayoutConstraint.activate([
+            endDateTextField.topAnchor.constraint(equalTo: endDateLabel.bottomAnchor, constant: 8),
+            endDateTextField.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 20),
+            endDateTextField.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -20),
+            endDateTextField.heightAnchor.constraint(equalToConstant: self.view.frame.height*0.05)
+            
+            
+        ])
+        
+        
+        // This will be added back in future PR
+        self.view.addSubview(imageLabel)
+        NSLayoutConstraint.activate([
+            imageLabel.topAnchor.constraint(equalTo: endDateTextField.bottomAnchor, constant: 20),
+            imageLabel.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 20),
+
+
+        ])
+        self.view.addSubview(addImageButton)
+        NSLayoutConstraint.activate([
+            addImageButton.topAnchor.constraint(equalTo: endDateTextField.bottomAnchor, constant: 20),
+            addImageButton.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -20),
+            imageLabel.trailingAnchor.constraint(equalTo: addImageButton.leadingAnchor),
+            addImageButton.leadingAnchor.constraint(equalTo: imageLabel.trailingAnchor)
+        ])
+        
+        
+        self.view.addSubview(attachmentCollection)
+        attachmentCollection.backgroundColor = .black
+        NSLayoutConstraint.activate([
+            attachmentCollection.topAnchor.constraint(equalTo: imageLabel.bottomAnchor, constant: 10),
+            attachmentCollection.leadingAnchor.constraint(equalTo: self.view.leadingAnchor, constant: 10),
+            attachmentCollection.trailingAnchor.constraint(equalTo: self.view.trailingAnchor, constant: -10),
+            attachmentCollection.bottomAnchor.constraint(equalTo: self.view.bottomAnchor, constant: -10),
+//            attachmentCollection.heightAnchor.constraint(equalTo: self.view.safeAreaLayoutGuide.heightAnchor, multiplier: 0.2)
+        ])
+        
+        
+        
+        
+    }
+    
+    @objc func addPhotoTapped(_ sender: Any) {
+        
+        cameraHelper.openCamera(in: self) { [weak self ] image in
+            guard let image = image else { return }
             self?.imagesAttached.append(image)
             self?.attachmentCollection.reloadData()
+            
         }
+        
     }
     
-    @IBAction func saveTapped(_ sender: UIBarButtonItem) {
+    
+//    @objc func addImageAttachment(_sender: Any) {
+//        // opening camera
+//        cameraHelper.openCamera(in: self) { [weak self] image in
+//            guard let image = image else { return }
+//
+//            // Adding attachment
+//            //            self?.imagesAttached.append(image)
+//            //            self?.attachmentCollection.reloadData()
+//        }
+//    }
+    
+    
+    @objc func saveTapped(_ sender: UIBarButtonItem) {
         hapticGenerator = UINotificationFeedbackGenerator()
         hapticGenerator?.prepare()
-        
+
         guard isValidTask() else {
             hapticGenerator?.notificationOccurred(.warning)
             return
@@ -77,7 +301,7 @@ class TaskDetailsViewController: UIViewController{
             self.navigationController?.popViewController(animated: true)
             return
         }
-        
+
         hapticGenerator?.notificationOccurred(.success)
 
         if isUpdate {
@@ -86,7 +310,7 @@ class TaskDetailsViewController: UIViewController{
             self.delegate?.didTapSave(task: task)
         }
         self.navigationController?.popViewController(animated: true)
-        
+
         hapticGenerator = nil
     }
     
@@ -128,31 +352,31 @@ class TaskDetailsViewController: UIViewController{
         return task
     }
     
-    func loadTaskForUpdate() {
-        guard let task = self.task else {
-            subTasksTextView.textColor = .placeholderText
-            return
-        }
-        taskTitleTextField.text = task.title
-        subTasksTextView.text = task.subTasks
-        endDateTextField.text = task.dueDate
-        
-        // Recover attachments
-        if let attachments = task.attachments {
-            imagesAttached = NSKeyedUnarchiver.unarchiveObject(with: attachments) as? [UIImage] ?? []
+        func loadTaskForUpdate() {
+            guard let task = self.task else {
+                subTasksTextView.textColor = .placeholderText
+                return
+            }
+            taskTitleTextField.text = task.title
+            subTasksTextView.text = task.subTasks
+            endDateTextField.text = task.dueDate
+    
+            // Recover attachments
+            if let attachments = task.attachments {
+                imagesAttached = NSKeyedUnarchiver.unarchiveObject(with: attachments) as? [UIImage] ?? []
+            }
         }
-    }
     
-    // IBOUTLET for datepicker
-    /// function is called when `Date is changed`
-    /// `Dateformatter` is used to convert `Date` to `String`
-    @objc func didPickDate(_ sender: UIDatePicker) {
-        dateFormatter.dateFormat = "MM/dd/yyyy hh:mm a"
-        let selectedDate = sender.date
-        self.selectedDateTimeStamp = sender.date.timeIntervalSince1970
-        endDate = dateFormatter.string(from: selectedDate)
-        endDateTextField.text = endDate
-    }
+        // IBOUTLET for datepicker
+        /// function is called when `Date is changed`
+        /// `Dateformatter` is used to convert `Date` to `String`
+        @objc func didPickDate(_ sender: UIDatePicker) {
+            dateFormatter.dateFormat = "MM/dd/yyyy hh:mm a"
+            let selectedDate = sender.date
+            self.selectedDateTimeStamp = sender.date.timeIntervalSince1970
+            endDate = dateFormatter.string(from: selectedDate)
+            endDateTextField.text = endDate
+        }
     
 }
 extension TaskDetailsViewController: UITextFieldDelegate, UITextViewDelegate {
@@ -179,23 +403,30 @@ extension TaskDetailsViewController: UITextFieldDelegate, UITextViewDelegate {
     }
 }
 
-extension TaskDetailsViewController: UICollectionViewDelegate, UICollectionViewDataSource {
+extension TaskDetailsViewController: UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout {
+    
+    func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
+        return CGSize(width: 100, height: 100)
+    }
     
+    
+
     func collectionView(_ collectionView: UICollectionView, numberOfItemsInSection section: Int) -> Int {
         return imagesAttached.count
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        
-        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: Constants.Cell.photoCell, for: indexPath) as! ImageAttachmentCell
+
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: ImageAttachmentCell.identifier, for: indexPath) as! ImageAttachmentCell
         let image = imagesAttached[indexPath.row]
-        
+
         cell.setImage(image)
-        
+
         return cell
     }
-    
+
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         debugPrint("Click: \(indexPath.row) \(imagesAttached[indexPath.row])")
     }
 }
+
diff --git a/Application/To-Do/View/Base.lproj/Main.storyboard b/Application/To-Do/View/Base.lproj/Main.storyboard
index a4dcf0e..29d6e68 100644
--- a/Application/To-Do/View/Base.lproj/Main.storyboard
+++ b/Application/To-Do/View/Base.lproj/Main.storyboard
@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Ays-iC-G6a">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Ays-iC-G6a">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
-        <capability name="collection view cell content view" minToolsVersion="11.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -36,7 +37,7 @@
                         <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="uSS-BT-6iJ">
                                 <rect key="frame" x="0.0" y="88" width="414" height="808"/>
-                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 <prototypes>
                                     <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="todocell" rowHeight="75" id="ufA-wl-Cek" customClass="TaskCell" customModule="To_Do" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="414" height="75"/>
@@ -95,14 +96,14 @@
                                 </connections>
                             </tableView>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="DlE-g9-AnT"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="uSS-BT-6iJ" firstAttribute="top" secondItem="DlE-g9-AnT" secondAttribute="top" id="ETj-QP-wgz"/>
                             <constraint firstAttribute="bottom" secondItem="uSS-BT-6iJ" secondAttribute="bottom" id="N8q-Mz-inr"/>
                             <constraint firstItem="uSS-BT-6iJ" firstAttribute="leading" secondItem="DlE-g9-AnT" secondAttribute="leading" id="Vta-P4-woK"/>
                             <constraint firstItem="DlE-g9-AnT" firstAttribute="trailing" secondItem="uSS-BT-6iJ" secondAttribute="trailing" id="WXB-Tn-2Pt"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="DlE-g9-AnT"/>
                     </view>
                     <navigationItem key="navigationItem" title="History" id="nyZ-60-KSb"/>
                     <connections>
@@ -137,156 +138,9 @@
                     <view key="view" contentMode="scaleToFill" id="IF7-jO-lyh">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <subviews>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Task" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aD0-wr-4cR">
-                                <rect key="frame" x="20" y="118" width="364" height="24"/>
-                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sub Tasks" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ngX-g4-4zR">
-                                <rect key="frame" x="20" y="221" width="374" height="24"/>
-                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="End Date" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oGd-cS-aUS">
-                                <rect key="frame" x="20" y="411" width="374" height="24"/>
-                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Enter task name" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DYv-OP-cPx">
-                                <rect key="frame" x="20" y="157" width="374" height="34"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits"/>
-                            </textField>
-                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Select end date" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0O5-ye-SqQ">
-                                <rect key="frame" x="20" y="450" width="374" height="34"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits"/>
-                            </textField>
-                            <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" text="Enter your subtask here" translatesAutoresizingMaskIntoConstraints="NO" id="SOr-LH-5cU">
-                                <rect key="frame" x="20" y="253" width="374" height="128"/>
-                                <color key="backgroundColor" systemColor="secondarySystemGroupedBackgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
-                                <color key="textColor" systemColor="labelColor" cocoaTouchSystemColor="darkTextColor"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
-                                <connections>
-                                    <outlet property="delegate" destination="4AD-BL-kUr" id="ROL-ZL-p1f"/>
-                                </connections>
-                            </textView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Image attachments" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="cbn-sN-pgB">
-                                <rect key="frame" x="20" y="514" width="244" height="24"/>
-                                <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
-                                <nil key="textColor"/>
-                                <nil key="highlightedColor"/>
-                            </label>
-                            <collectionView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleAspectFit" dataMode="prototypes" translatesAutoresizingMaskIntoConstraints="NO" id="dqp-Jd-xtV">
-                                <rect key="frame" x="30" y="553" width="354" height="240"/>
-                                <color key="backgroundColor" red="0.0" green="0.12226864283311639" blue="0.78795382957559679" alpha="0.02" colorSpace="custom" customColorSpace="sRGB"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="100" id="X6f-aU-RJR"/>
-                                </constraints>
-                                <inset key="scrollIndicatorInsets" minX="10" minY="10" maxX="10" maxY="10"/>
-                                <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="10" minimumInteritemSpacing="10" id="AXz-gh-pTf">
-                                    <size key="itemSize" width="100" height="100"/>
-                                    <size key="estimatedItemSize" width="100" height="100"/>
-                                    <size key="headerReferenceSize" width="0.0" height="0.0"/>
-                                    <size key="footerReferenceSize" width="0.0" height="0.0"/>
-                                    <inset key="sectionInset" minX="10" minY="10" maxX="10" maxY="10"/>
-                                </collectionViewFlowLayout>
-                                <cells>
-                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="AttachmentCell" id="VG4-FJ-TZV" customClass="ImageAttachmentCell" customModule="To_Do" customModuleProvider="target">
-                                        <rect key="frame" x="10" y="10" width="100" height="100"/>
-                                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                                        <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="o4O-nU-fCm">
-                                            <rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
-                                            <autoresizingMask key="autoresizingMask"/>
-                                            <subviews>
-                                                <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="0qq-W8-Tdt">
-                                                    <rect key="frame" x="0.0" y="0.0" width="100" height="100"/>
-                                                    <constraints>
-                                                        <constraint firstAttribute="width" constant="100" id="y9V-O6-PJg"/>
-                                                        <constraint firstAttribute="height" constant="100" id="zA7-6U-mok"/>
-                                                    </constraints>
-                                                </imageView>
-                                            </subviews>
-                                            <constraints>
-                                                <constraint firstAttribute="bottom" secondItem="0qq-W8-Tdt" secondAttribute="bottom" id="28s-5b-Kkg"/>
-                                                <constraint firstAttribute="trailing" secondItem="0qq-W8-Tdt" secondAttribute="trailing" id="TTY-5b-771"/>
-                                                <constraint firstItem="0qq-W8-Tdt" firstAttribute="top" secondItem="o4O-nU-fCm" secondAttribute="top" id="Ykb-Pr-Fxt"/>
-                                                <constraint firstItem="0qq-W8-Tdt" firstAttribute="leading" secondItem="o4O-nU-fCm" secondAttribute="leading" id="tUF-J0-Q3M"/>
-                                            </constraints>
-                                        </collectionViewCellContentView>
-                                        <connections>
-                                            <outlet property="imageView" destination="0qq-W8-Tdt" id="ORg-Xs-1oK"/>
-                                        </connections>
-                                    </collectionViewCell>
-                                </cells>
-                                <connections>
-                                    <outlet property="dataSource" destination="4AD-BL-kUr" id="9dM-BB-lGK"/>
-                                    <outlet property="delegate" destination="4AD-BL-kUr" id="psV-6i-u9l"/>
-                                </connections>
-                            </collectionView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="94v-so-iyY">
-                                <rect key="frame" x="284" y="514" width="100" height="30"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="100" id="eLV-gY-37Y"/>
-                                </constraints>
-                                <state key="normal" title="Add image"/>
-                                <connections>
-                                    <action selector="addImageAttachment:" destination="4AD-BL-kUr" eventType="touchUpInside" id="O7U-HU-ako"/>
-                                </connections>
-                            </button>
-                        </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
-                        <constraints>
-                            <constraint firstItem="7AC-Jy-fo4" firstAttribute="trailing" secondItem="94v-so-iyY" secondAttribute="trailing" constant="30" id="0lh-ae-dVL"/>
-                            <constraint firstItem="SOr-LH-5cU" firstAttribute="top" secondItem="ngX-g4-4zR" secondAttribute="bottom" constant="8" id="1Cj-bc-dHP"/>
-                            <constraint firstItem="cbn-sN-pgB" firstAttribute="top" secondItem="0O5-ye-SqQ" secondAttribute="bottom" constant="30" id="2MB-oA-S1R"/>
-                            <constraint firstItem="7AC-Jy-fo4" firstAttribute="trailing" secondItem="dqp-Jd-xtV" secondAttribute="trailing" constant="30" id="3NQ-G5-UBl"/>
-                            <constraint firstItem="SOr-LH-5cU" firstAttribute="leading" secondItem="7AC-Jy-fo4" secondAttribute="leading" constant="20" id="5J7-D1-tUG"/>
-                            <constraint firstItem="7AC-Jy-fo4" firstAttribute="trailing" secondItem="SOr-LH-5cU" secondAttribute="trailing" constant="20" id="DOt-QU-SnB"/>
-                            <constraint firstItem="0O5-ye-SqQ" firstAttribute="leading" secondItem="7AC-Jy-fo4" secondAttribute="leading" constant="20" id="Frh-tw-mW9"/>
-                            <constraint firstItem="oGd-cS-aUS" firstAttribute="leading" secondItem="7AC-Jy-fo4" secondAttribute="leading" constant="20" id="Gag-U9-qOU"/>
-                            <constraint firstItem="0O5-ye-SqQ" firstAttribute="top" secondItem="oGd-cS-aUS" secondAttribute="bottom" constant="15" id="IyD-au-dO3"/>
-                            <constraint firstItem="7AC-Jy-fo4" firstAttribute="trailing" secondItem="ngX-g4-4zR" secondAttribute="trailing" constant="20" id="KZC-GI-o3f"/>
-                            <constraint firstItem="7AC-Jy-fo4" firstAttribute="trailing" secondItem="DYv-OP-cPx" secondAttribute="trailing" constant="20" id="L2e-hg-zT9"/>
-                            <constraint firstItem="94v-so-iyY" firstAttribute="leading" secondItem="cbn-sN-pgB" secondAttribute="trailing" constant="20" id="LE8-w5-JRb"/>
-                            <constraint firstItem="cbn-sN-pgB" firstAttribute="leading" secondItem="7AC-Jy-fo4" secondAttribute="leading" constant="20" id="Mo3-YT-VPz"/>
-                            <constraint firstItem="ngX-g4-4zR" firstAttribute="leading" secondItem="7AC-Jy-fo4" secondAttribute="leading" constant="20" id="Mw6-Fo-ypS"/>
-                            <constraint firstItem="SOr-LH-5cU" firstAttribute="height" secondItem="IF7-jO-lyh" secondAttribute="height" multiplier="0.142857" id="Nob-xn-Xok"/>
-                            <constraint firstItem="dqp-Jd-xtV" firstAttribute="leading" secondItem="7AC-Jy-fo4" secondAttribute="leading" constant="30" id="Rgf-nk-rNH"/>
-                            <constraint firstItem="dqp-Jd-xtV" firstAttribute="top" secondItem="cbn-sN-pgB" secondAttribute="bottom" constant="15" id="WPT-l0-Uac"/>
-                            <constraint firstItem="7AC-Jy-fo4" firstAttribute="trailing" secondItem="0O5-ye-SqQ" secondAttribute="trailing" constant="20" id="bI4-Rp-KxC"/>
-                            <constraint firstItem="oGd-cS-aUS" firstAttribute="top" secondItem="SOr-LH-5cU" secondAttribute="bottom" constant="30" id="dFp-6F-mhR"/>
-                            <constraint firstItem="DYv-OP-cPx" firstAttribute="top" secondItem="aD0-wr-4cR" secondAttribute="bottom" constant="15" id="eEh-pK-aPF"/>
-                            <constraint firstItem="DYv-OP-cPx" firstAttribute="leading" secondItem="7AC-Jy-fo4" secondAttribute="leading" constant="20" id="hE3-p2-asy"/>
-                            <constraint firstItem="7AC-Jy-fo4" firstAttribute="trailing" secondItem="oGd-cS-aUS" secondAttribute="trailing" constant="20" id="jpH-bL-1Q0"/>
-                            <constraint firstItem="7AC-Jy-fo4" firstAttribute="trailing" secondItem="aD0-wr-4cR" secondAttribute="trailing" constant="30" id="lHC-Rd-gGU"/>
-                            <constraint firstItem="ngX-g4-4zR" firstAttribute="top" secondItem="DYv-OP-cPx" secondAttribute="bottom" constant="30" id="lTp-7P-vq2"/>
-                            <constraint firstItem="aD0-wr-4cR" firstAttribute="top" secondItem="7AC-Jy-fo4" secondAttribute="top" constant="30" id="mO8-ND-JXo"/>
-                            <constraint firstItem="7AC-Jy-fo4" firstAttribute="bottom" secondItem="dqp-Jd-xtV" secondAttribute="bottom" constant="20" id="q16-To-gEs"/>
-                            <constraint firstItem="94v-so-iyY" firstAttribute="top" secondItem="0O5-ye-SqQ" secondAttribute="bottom" constant="30" id="tV3-Wf-90U"/>
-                            <constraint firstItem="aD0-wr-4cR" firstAttribute="leading" secondItem="7AC-Jy-fo4" secondAttribute="leading" constant="20" id="yJH-LP-vqT"/>
-                        </constraints>
                         <viewLayoutGuide key="safeArea" id="7AC-Jy-fo4"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     </view>
-                    <navigationItem key="navigationItem" largeTitleDisplayMode="never" id="4zH-lp-Fau">
-                        <barButtonItem key="rightBarButtonItem" title="Save" style="plain" id="Zfe-d1-cWG">
-                            <connections>
-                                <action selector="saveTapped:" destination="4AD-BL-kUr" id="eVG-rf-5Sx"/>
-                            </connections>
-                        </barButtonItem>
-                    </navigationItem>
-                    <connections>
-                        <outlet property="attachmentCollection" destination="dqp-Jd-xtV" id="HHw-0K-TtY"/>
-                        <outlet property="endDateTextField" destination="0O5-ye-SqQ" id="f9x-Mx-5Yb"/>
-                        <outlet property="saveButton" destination="Zfe-d1-cWG" id="CS6-gQ-3b9"/>
-                        <outlet property="subTasksTextView" destination="SOr-LH-5cU" id="Tgd-o5-RzQ"/>
-                        <outlet property="taskTitleTextField" destination="DYv-OP-cPx" id="sKT-Si-kZi"/>
-                    </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="1xx-mu-0DN" userLabel="First Responder" customClass="UIResponder" sceneMemberID="firstResponder"/>
             </objects>
@@ -323,7 +177,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Never forget any task again." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="j8m-fw-ILx">
-                                                        <rect key="frame" x="76" y="0.0" width="224" height="20.5"/>
+                                                        <rect key="frame" x="76" y="0.0" width="222.5" height="20.5"/>
                                                         <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
@@ -335,7 +189,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                 </subviews>
-                                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                 <constraints>
                                                     <constraint firstAttribute="trailing" secondItem="EpX-Oj-A98" secondAttribute="trailing" id="274-Pb-fOJ"/>
                                                     <constraint firstItem="wFL-11-ceo" firstAttribute="top" secondItem="UJY-1L-u31" secondAttribute="top" id="Obs-4b-bPp"/>
@@ -359,7 +213,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Sort your tasks." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="fjp-3s-m6T">
-                                                        <rect key="frame" x="76" y="0.0" width="126.5" height="20.5"/>
+                                                        <rect key="frame" x="76" y="0.0" width="126" height="20.5"/>
                                                         <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
@@ -371,7 +225,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                 </subviews>
-                                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                 <constraints>
                                                     <constraint firstItem="TTy-ae-Caa" firstAttribute="top" secondItem="GpJ-tY-hTi" secondAttribute="top" id="059-58-ruI"/>
                                                     <constraint firstAttribute="bottom" secondItem="gOW-5m-m79" secondAttribute="bottom" id="5tD-jh-zC6"/>
@@ -395,7 +249,7 @@
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Set priorities for your tasks." textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="odz-9X-63U">
-                                                        <rect key="frame" x="76" y="0.0" width="221" height="20.5"/>
+                                                        <rect key="frame" x="76" y="0.0" width="220" height="20.5"/>
                                                         <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
@@ -409,7 +263,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                 </subviews>
-                                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                 <constraints>
                                                     <constraint firstItem="kob-6N-gf7" firstAttribute="leading" secondItem="odz-9X-63U" secondAttribute="leading" id="4ZF-Ok-lsk"/>
                                                     <constraint firstAttribute="bottom" secondItem="kob-6N-gf7" secondAttribute="bottom" id="4ea-bs-7FI"/>
@@ -426,14 +280,14 @@
                                                 <rect key="frame" x="16" y="362.5" width="382" height="58.5"/>
                                                 <subviews>
                                                     <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="timer" catalog="system" translatesAutoresizingMaskIntoConstraints="NO" id="Xez-SX-9w2">
-                                                        <rect key="frame" x="0.0" y="0.5" width="60" height="59"/>
+                                                        <rect key="frame" x="0.0" y="1" width="60" height="59"/>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="60" id="Qkn-N0-Sr7"/>
                                                             <constraint firstAttribute="height" constant="60" id="dXA-t5-eb3"/>
                                                         </constraints>
                                                     </imageView>
                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Task History" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wb0-kW-e6i">
-                                                        <rect key="frame" x="76" y="0.0" width="99.5" height="20.5"/>
+                                                        <rect key="frame" x="76" y="0.0" width="99" height="20.5"/>
                                                         <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="17"/>
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
@@ -447,7 +301,7 @@
                                                         <nil key="highlightedColor"/>
                                                     </label>
                                                 </subviews>
-                                                <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                                <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                 <constraints>
                                                     <constraint firstItem="Wb0-kW-e6i" firstAttribute="top" secondItem="H25-Aj-SI2" secondAttribute="top" id="0WT-Ej-9JQ"/>
                                                     <constraint firstAttribute="bottom" secondItem="hUt-3Y-bv9" secondAttribute="bottom" id="A2b-Jp-P7i"/>
@@ -460,9 +314,9 @@
                                                     <constraint firstItem="Wb0-kW-e6i" firstAttribute="leading" secondItem="Xez-SX-9w2" secondAttribute="trailing" constant="16" id="hL8-wl-wJ2"/>
                                                 </constraints>
                                             </view>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uHe-DW-zV4">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uHe-DW-zV4">
                                                 <rect key="frame" x="16" y="738" width="382" height="48"/>
-                                                <color key="backgroundColor" systemColor="systemBlueColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                <color key="backgroundColor" systemColor="systemBlueColor"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="48" id="7Mc-z5-TV3"/>
                                                 </constraints>
@@ -474,7 +328,7 @@
                                                 </connections>
                                             </button>
                                         </subviews>
-                                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                         <constraints>
                                             <constraint firstItem="3TG-cX-Xtw" firstAttribute="top" secondItem="GpJ-tY-hTi" secondAttribute="bottom" constant="32" id="4e9-D3-hxc"/>
                                             <constraint firstItem="uHe-DW-zV4" firstAttribute="trailing" secondItem="3TG-cX-Xtw" secondAttribute="trailing" id="6qR-pN-pnf"/>
@@ -508,14 +362,14 @@
                                 <viewLayoutGuide key="frameLayoutGuide" id="XTf-gy-7jB"/>
                             </scrollView>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <viewLayoutGuide key="safeArea" id="0QU-mh-IJ2"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="0QU-mh-IJ2" firstAttribute="bottom" secondItem="EH6-YJ-DJZ" secondAttribute="bottom" id="5VZ-Cy-xYx"/>
                             <constraint firstItem="EH6-YJ-DJZ" firstAttribute="leading" secondItem="0QU-mh-IJ2" secondAttribute="leading" id="Y0j-vL-eEJ"/>
                             <constraint firstItem="0QU-mh-IJ2" firstAttribute="top" secondItem="EH6-YJ-DJZ" secondAttribute="top" id="lc0-ni-rxu"/>
                             <constraint firstItem="0QU-mh-IJ2" firstAttribute="trailing" secondItem="EH6-YJ-DJZ" secondAttribute="trailing" id="zGN-6d-oPx"/>
                         </constraints>
-                        <viewLayoutGuide key="safeArea" id="0QU-mh-IJ2"/>
                     </view>
                     <connections>
                         <outlet property="nextButton" destination="uHe-DW-zV4" id="wAQ-Gk-9Qo"/>
@@ -532,7 +386,7 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="LGs-Rx-YcS">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="todocell" rowHeight="75" id="wkZ-0H-4Ms" customClass="TaskCell" customModule="To_Do" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="28" width="414" height="75"/>
@@ -620,7 +474,7 @@
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="prototypes" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" id="Dfw-Dl-XqY">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="todocell" textLabel="2Vz-e5-Se0" detailTextLabel="APq-gh-o8O" rowHeight="75" style="IBUITableViewCellStyleSubtitle" id="DKs-Fh-LeQ">
                                 <rect key="frame" x="0.0" y="28" width="414" height="75"/>
@@ -630,7 +484,7 @@
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" insetsLayoutMarginsFromSafeArea="NO" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2Vz-e5-Se0">
-                                            <rect key="frame" x="20" y="17" width="33.5" height="20.5"/>
+                                            <rect key="frame" x="20" y="17" width="33" height="20.5"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                             <nil key="textColor"/>
@@ -678,11 +532,17 @@
         </scene>
     </scenes>
     <resources>
-        <image name="arrow.up.arrow.down" catalog="system" width="64" height="48"/>
-        <image name="folder" catalog="system" width="64" height="46"/>
-        <image name="pencil" catalog="system" width="64" height="56"/>
-        <image name="star.circle" catalog="system" width="64" height="60"/>
-        <image name="timer" catalog="system" width="64" height="60"/>
-        <image name="tray" catalog="system" width="64" height="44"/>
+        <image name="arrow.up.arrow.down" catalog="system" width="128" height="98"/>
+        <image name="folder" catalog="system" width="128" height="97"/>
+        <image name="pencil" catalog="system" width="128" height="113"/>
+        <image name="star.circle" catalog="system" width="128" height="121"/>
+        <image name="timer" catalog="system" width="128" height="121"/>
+        <image name="tray" catalog="system" width="128" height="88"/>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
+        <systemColor name="systemBlueColor">
+            <color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
     </resources>
 </document>
diff --git a/Application/To-Do/View/Cells/ImageAttachmentCell.swift b/Application/To-Do/View/Cells/ImageAttachmentCell.swift
index c0434e0..49677ab 100644
--- a/Application/To-Do/View/Cells/ImageAttachmentCell.swift
+++ b/Application/To-Do/View/Cells/ImageAttachmentCell.swift
@@ -9,7 +9,35 @@
 import UIKit
 
 class ImageAttachmentCell: UICollectionViewCell {
-    @IBOutlet private weak var imageView: UIImageView!
+//    @IBOutlet private weak var imageView: UIImageView!
+    static let identifier: String = "ImageAttachmentCell"
+    
+    let imageView: UIImageView = {
+        let iv = UIImageView()
+        iv.translatesAutoresizingMaskIntoConstraints = false
+        return iv
+    }()
+    
+    
+    override init(frame: CGRect) {
+        super.init(frame: frame)
+        
+        contentView.addSubview(imageView)
+        
+        NSLayoutConstraint.activate([
+            imageView.leadingAnchor.constraint(equalTo: contentView.leadingAnchor),
+            imageView.trailingAnchor.constraint(equalTo: contentView.trailingAnchor),
+            imageView.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
+            imageView.topAnchor.constraint(equalTo: contentView.topAnchor)
+        ])
+        
+        
+    }
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+    
     
     func setImage(_ image: UIImage?) {
         imageView.image = image