Small HUD adjustements and fixes