 		
 		initialCaption = containerView.captionView.getCaption()
 		
-		let flipButton = UIBarButtonItem(image: #imageLiteral(resourceName: "refresh"), style: .plain, target: containerView, action: #selector(PhotoContainerView.flip))
-		let cancelButton = UIBarButtonItem(barButtonSystemItem: .cancel, target: self, action: #selector(cancel))
-		navigationItem.setRightBarButtonItems([cancelButton, flipButton], animated: false)
+		navigationItem.rightBarButtonItem =
+			UIBarButtonItem(image: #imageLiteral(resourceName: "refresh"), style: .plain, target: containerView, action: #selector(PhotoContainerView.flip))
 		
 		// Don't mess with the captionView insets
 		automaticallyAdjustsScrollViewInsets = false

		
		// Show the original tab bar again
		tabBarController?.tabBar.isHidden = false
	}
	
	func cancel() {
		
		canceled = true
		let _ = navigationController?.popViewController(animated: true)
	}
	
	// MARK: Actions

		// Update the Photo object with our changes
		// and kick off a save before we leave the view
		let caption = containerView.captionView.getCaption()
		if !deleted && caption != initialCaption {
			
			photo.caption = caption
			photo.lastUpdated = NSDate()
