Various tweaks and fixes; added RenamePopover