fixed for all the pages and remake of some sections in two pages