Player page mostly fixed up