Fixing HUD BUGs which makes it update realtime
conflicts fixed