Some changes to the HUD, still getting everything laying out right.
Merge remote-tracking branch 'Github/master'