Some rework of the page