Add simple_form, country_select and update devise