Added truncation and slight single page improvements