Improve translation
Fix body layout