* Added some translation and UX improvements