* Adding a couple UI and translation improvements