Layout fixes and translations for comment