some change on template and image selector