all pages fixes