add image and clean button
Merge branch '20130618-penny'