hud improvements and bug fix