Refactor design on link pages