diff --git a/.DS_Store b/.DS_Store
index f9766d0..d1356d2 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate
index 3cb8fd2..5bbeb88 100644
Binary files a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate and b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/UserInterfaceState.xcuserstate differ
diff --git a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
index d38c779..63ca4fd 100644
--- a/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
+++ b/Vendoo.xcworkspace/xcuserdata/okechi.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -279,8 +279,8 @@
                   symbolName = "Vendoo.ExternalWebViewController.contentStringUrlType.getter : Swift.Optional<Swift.String>"
                   moduleName = "Vendoo"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
-                  timestampString = "505232756.284131"
+                  urlString = "file:///Users/okechi/Documents/iOs%20Practice/Kroleo/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
+                  timestampString = "506359937.526087"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "32"
@@ -294,8 +294,8 @@
                   symbolName = "Vendoo.ExternalWebViewController.contentStringUrlType.setter : Swift.Optional<Swift.String>"
                   moduleName = "Vendoo"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
-                  timestampString = "505232756.284321"
+                  urlString = "file:///Users/okechi/Documents/iOs%20Practice/Kroleo/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
+                  timestampString = "506359937.526342"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "32"
@@ -309,8 +309,8 @@
                   symbolName = "Vendoo.ExternalWebViewController.init (nibName : Swift.Optional<Swift.String>, bundle : Swift.Optional<__ObjC.NSBundle>) -> Vendoo.ExternalWebViewController"
                   moduleName = "Vendoo"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
-                  timestampString = "505232756.284478"
+                  urlString = "file:///Users/okechi/Documents/iOs%20Practice/Kroleo/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
+                  timestampString = "506359937.526555"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "32"
@@ -324,8 +324,8 @@
                   symbolName = "Vendoo.ExternalWebViewController.init (coder : __ObjC.NSCoder) -> Swift.Optional<Vendoo.ExternalWebViewController>"
                   moduleName = "Vendoo"
                   usesParentBreakpointCondition = "Yes"
-                  urlString = "file:///Users/okechi/Documents/iOs%20Practice/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
-                  timestampString = "505232756.284637"
+                  urlString = "file:///Users/okechi/Documents/iOs%20Practice/Kroleo/Vendoo/Vendoo_bb/Vendoo/Vendoo/ExternalWebViewController.swift"
+                  timestampString = "506359937.526814"
                   startingColumnNumber = "9223372036854775807"
                   endingColumnNumber = "9223372036854775807"
                   startingLineNumber = "32"
@@ -591,5 +591,37 @@
             landmarkType = "5">
          </BreakpointContent>
       </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Vendoo/ItemTableViewController.swift"
+            timestampString = "506355695.058673"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "548"
+            endingLineNumber = "548"
+            landmarkName = "tableView(_:titleForHeaderInSection:)"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
+      <BreakpointProxy
+         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
+         <BreakpointContent
+            shouldBeEnabled = "Yes"
+            ignoreCount = "0"
+            continueAfterRunningActions = "No"
+            filePath = "Vendoo/EbayWebServiceManager.swift"
+            timestampString = "506359165.328679"
+            startingColumnNumber = "9223372036854775807"
+            endingColumnNumber = "9223372036854775807"
+            startingLineNumber = "438"
+            endingLineNumber = "438"
+            landmarkName = "parser(_:foundCharacters:)"
+            landmarkType = "5">
+         </BreakpointContent>
+      </BreakpointProxy>
    </Breakpoints>
 </Bucket>
diff --git a/Vendoo/ItemImagePickerViewController.swift b/Vendoo/ItemImagePickerViewController.swift
index 59f712b..3c8e8de 100644
--- a/Vendoo/ItemImagePickerViewController.swift
+++ b/Vendoo/ItemImagePickerViewController.swift
@@ -104,7 +104,9 @@ class ItemImagePickerViewController: UIViewController {
     
     override func viewWillAppear(animated: Bool) {
         super.viewWillAppear(animated)
-        self.firManager = (self.tabBarController as! HomeViewController).firebaseManager
+        if (!self.isEditing) {
+            self.firManager = (self.tabBarController as! HomeViewController).firebaseManager
+        }
         self.tabBarController?.tabBar.hidden = true
     }
     
diff --git a/Vendoo/ItemTableViewController.swift b/Vendoo/ItemTableViewController.swift
index 55770a7..2e792a5 100644
--- a/Vendoo/ItemTableViewController.swift
+++ b/Vendoo/ItemTableViewController.swift
@@ -547,15 +547,19 @@ extension ItemTableViewController: UITableViewDataSource{
     func tableView(tableView: UITableView, titleForHeaderInSection section: Int) -> String? {
         if(self.tableSegmentController.selectedSegmentIndex == 1){
             if(section == 1){
-                return "Unsold"
+                return (self.tabBarController as? HomeViewController)!.userListings.count > 0 ? "Unsold" : ""
             }else{
-                return "Sold"
+                return (self.tabBarController as? HomeViewController)!.userListings.count > 0 ? "Sold" : ""
             }
         }else{
-            if(section == 1){
-                return "Draft"
+            if (self.tabBarController as? HomeViewController)!.userListings.count > 0 {
+                if(section == 1){
+                    return "Draft"
+                }else{
+                    return "Active"
+                }
             }else{
-                return "Active"
+                return ""
             }
         }
     }