Change Screens to use HUD class