Many formatting updates.

Next: resolve overlay menu issue.