Moved drawing of obstacles/shape/agents into their own methods