Improved UX and translation