added shapes working and image display