 * Adding some UX and translation improvements
