Merge branch 'ItemRenderer'
Merge branch 'ItemRenderer'
Merge branch 'master' into ItemRenderer
Add Image && change lay-out