several fixes in all pages