removing extra class from input and changing field labels to label elements