- Add key and version info.
- Lame attempt at cleaning up the layout.