changes to design and import app compat issues, some translations accounted for