code clean, minor fixes for it translation and UI tweaks