Add name in Dialog and Fix