improve Locale strategy + forms tweaks