Fixed settings bug
Fixed field option bug