Added images for #1 and #2, updated template, fixed small bug on #1