add country select and who text field, done with branch