Merged with Jesse's HUD changes.