Mockup: Fixing links between pages II (Work in progress).