Improved all pages slightly