updated the new layout