modify plan and add layout
modify test
small fix in plan
Merge pull request #15 from dara123/development

plan and layout resource