Updates to gun targeting UI. Fixes #5710

Lots of redundancy in this one...