Adapted pages to new layout