- improved the localization handling

note: still working on the add/edit views