Added a player to the output + layout fixes.

Depending on the environment I might have split this commit into
two patches.