Presentation improvements
Fix wrapping
Fix logging