Added portions to make the display look better
Merge origin/master
Added formatting things to make the display line up correctly
Merge origin/master

Conflicts:
	resolved conflict with style, I had changed some of the display options so it would display player correctly