2nd page fixes