* Added some UX, stability and translation improvements