Cleaned up set/run logic

Updating current player

Tweak styling