Tweak layout, fix links