Merge branch 'pirdad'
item page complate
marging pirdad's update
test image is add
fixed a few minor things.