add image and shape widgets
shape still buggy