Fix Sort and Edit Name