Fix heading rendering
Extract shot draw