changed some text fileds to labels