Updated labels, and moved around some fields, added validation