New iteration on the page layout and minor fixes in text