Added second label and added name field functionality