add localization and few UI fix