More work on the HUD stuff