add localization and in app bugs fixed