Changed spans around form, worked on settings