[nuvid] Adapt to latest layout changes