add image, move presentation code in their rightful place