Adding country dropdown and fixing bug