form updates

moved fields
classed fields and labels