Adding shapes and images