Upgrading player gui
Merge pull request #6543 from s1ww/upgraded_gui

Upgrading player gui redux