Binding data to fields
removing class on click again
CHanges to binding