Layout fixes: long edges, remove extra whitespace, parent-line alignment, etc.