Polishing/normalizing new GUI
Merge pull request #6518 from s1ww/player_gui

Polishing/normalizing new GUI