added container drawing
added images and fixed merge conflicts
fixed displaying of containers