Adapt to new layout structure