Add some styling and a few fixups.