Fix change-player bug
Rework graphics