WIP: layout changes, truncate long lines, other cosmetics.