Hotfixes from live: added images, default template changed