Numerous updates and improved layout.

See commit logs.