         let results = object.dynamicList(propertyName)
         return Array(results)
     }
+    
+    // MARK: - Actions
 
     @objc func actionToggleEdit(_ id: UIBarButtonItem) {
         isEditMode.toggle()
         if isEditMode {
-            id.title = "Finish"
+            navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .done, target: self, action: .toggleEdit)
         } else {
-            id.title = "Edit"
+            navigationItem.rightBarButtonItem = UIBarButtonItem(barButtonSystemItem: .edit, target: self, action: .toggleEdit)
         }
         viewRealm.tableView.reloadData()
     }

    }
}

fileprivate extension Selector {
    static let toggleEdit = #selector(RealmPropertyBrowser.actionToggleEdit(_:))
}

        viewRealm.tableView.register(RealmPropertyCell.self, forCellReuseIdentifier: RealmPropertyCell.identifier)
    }

    // MARK: - private methods

    private func savePropertyChangesInRealm(_ newValue: String, property: Property) {
        let letters = CharacterSet.letters
        switch property.type {
        case .bool:
            let propertyValue = Bool(newValue)!
