 * Adding some UX, stability and translation improvements
