Add radio button; Reformat some codes