Make further changes to HUD code