next.js

refactor: Improve templates layout flexibility

#89245

Merged