Fixing issue #35. And some spitshine on the rename/delete dialogs.