set position
add pic
add button and detail
add others pic
add others folder
Merge remote-tracking branch 'origin/master'