update to new layout