modify plan and add layout