[FIX] update the layouts