Some styling and refactoring
Merge branch 'master' into event-handling-and-websockets

Conflicts:
	src/main/resources/assets/components/player-listing/player-listing.html