Set full page to true and minor clean