Bugfix for issues from last release

Also changed order of rendering certain things, should look less messy
when you have the player list open.