Minor update for now/next layout