Change to page links, remove redundent functions. #kentprojects-114