Fix table layout issue.
Improve package reference shortening.