Fixed some things

- Shield bug
- Moved data drawing to HUD class