* Adding some stability, translation and UX improvements