Improve Hud classes