Some work on links + layouts