                 cell.imageView?.setIcon(bookmark.favicon, withPlaceholder: FaviconFetcher.defaultFavicon)
             }
             cell.accessoryType = .None
-            cell.setNeedsLayout()
-
             return cell
         case is BookmarkSeparator:
             return tableView.dequeueReusableCellWithIdentifier(BookmarkSeparatorCellIdentifier, forIndexPath: indexPath)
         case let bookmark as BookmarkFolder:
-            let cell = super.tableView(tableView, cellForRowAtIndexPath: indexPath)
+            let cell = UITableViewCell(style: .Default, reuseIdentifier: nil)
             cell.textLabel?.font = UIFont.boldSystemFontOfSize(14)
             cell.textLabel?.text = bookmark.title
-            cell.textLabel?.setNeedsLayout()
             cell.imageView?.image = UIImage(named: "bookmarks_folder_hollow")
-
             cell.accessoryType = .DisclosureIndicator
-            cell.setNeedsLayout()
-
             return cell
         default:
             // This should never happen.

            
            if let sqllitbk = self.profile.bookmarks as? MergedSQLiteBookmarks {
                //we split up the update into class-specific functions so we get more compile time & runtime checks before writing into the DB
                if let bookmarkItem = bookmark as? BookmarkItem {
                    //bookmark items ALWAYS pass along the folderGUID even if not changed hence we can force newFolderGUID!
                    sqllitbk.editBookmarkItem(bookmarkItem, title:newTitle, parentGUID: newFolderGUID!, completion: refreshBlock)
                    
                }
                else if let bookmarkFolder = bookmark as? BookmarkFolder {


    func addFolder(alert: UIAlertAction!, alertController: UIAlertController) {
        postAsyncToBackground {
            if let folderName = alertController.textFields?[0].text  {
                if let sqllitbk = self.profile.bookmarks as? MergedSQLiteBookmarks {
                    sqllitbk.createFolder(folderName) {
                        postAsyncToMain {
