Added span tags around input fields
Add sanity check to address entries