Improve policy a little bit: page layout & link