 * Added some UI and translation improvements
