Adapted page to new layout