Adding images and fixing bugs