[TASK] Update Layouts