added remove image button
merge with github.com/master