Layout tweaks, fixed inter-page links