main pages fixes