* Adding some translation and UX improvements