Small fixes to Crosshair UI