* Adding some translation, stability and ux improvements