updated image upload text
resolve trailing whitespace
add focus country field