Added image template, and some improvements