HUD improvements / beginning of shields
UI improvements
Another day another merge conflict