prettier HUD
fixed merge, updated UI