Improved translation and minor appearance fix