Make the UI more accurately reflect the player state
Fix broken tests
Signed-off-by: Kurt Aaholst <kaaholst@gmail.com>