Tweak the images, reorganize templates and add widgets