Layout cleanup

And add some useful links.