Added upgrade collision and drawing