* Adding some translation and UI fixes