clean up & add uiimage+gif