internationalization fix and layout improments