Added rectangle drawing and shape's inside check