* Added some UX, translation and stability improvements