fixes in main pages