move specific code of viewing pages to own branch